diff options
| author |  Luke Diamand <luke@diamand.org> | 2018-06-19 09:04:07 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-19 09:34:31 -0700 |
| commit | dba1c9d9f26ac9fce55d0bfde8a040700fc9ff52 (patch) | |
| tree | 39a82034fb314c92845a49bc2b3bfc1216e84c70 /t/t6037-merge-ours-theirs.sh | |
| parent | git-p4: python3: replace <> with != (diff) | |
| download | tgif-dba1c9d9f26ac9fce55d0bfde8a040700fc9ff52.tar.xz | |
git-p4: python3: replace dict.has_key(k) with "k in dict"
Python3 does not have the dict.has_key() function, so replace all
such calls with "k in dict". This will still work with python2.6
and python2.7.
Converted using 2to3 (plus some hand-editing)
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