diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-18 12:20:29 -0700 |
| commit | 6dcd36473a20e90d02463de5fe33eb94c4c33fa6 (patch) | |
| tree | ef06b293d991cfeab8976232ae2e77a7debd3c49 /mergetools/guiffy | |
| parent | Merge branch 'ds/ewah-cleanup' (diff) | |
| parent | git-p4: python3: fix octal constants (diff) | |
| download | tgif-6dcd36473a20e90d02463de5fe33eb94c4c33fa6.tar.xz | |
Merge branch 'ld/p423'
Code preparation to make "git p4" closer to be usable with Python 3.
* ld/p423:
git-p4: python3: fix octal constants
git-p4: python3: use print() function
git-p4: python3: basestring workaround
git-p4: python3: remove backticks
git-p4: python3: replace dict.has_key(k) with "k in dict"
git-p4: python3: replace <> with !=
Diffstat (limited to 'mergetools/guiffy')
0 files changed, 0 insertions, 0 deletions