diff options
| author |  Luke Diamand <luke@diamand.org> | 2018-06-19 09:04:06 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-19 09:34:31 -0700 |
| commit | fc35c9d5dc8fefbc29e9713e6b47eb4c19579d56 (patch) | |
| tree | 8816daeaab20cee058ec4439caadfcfc87b60f07 /t/t6037-merge-ours-theirs.sh | |
| parent | Merge tag 'l10n-2.18.0-rnd3.1' of git://github.com/git-l10n/git-po (diff) | |
| download | tgif-fc35c9d5dc8fefbc29e9713e6b47eb4c19579d56.tar.xz | |
git-p4: python3: replace <> with !=
The <> string inequality operator (which doesn't seem to be even
documented) no longer exists in python3. Replace with !=.
This still works with python2.
Signed-off-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions