summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Luke Diamand <luke@diamand.org>2018-06-19 09:04:11 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-19 09:34:32 -0700
commitdb2d997efa43596fe5860d1b1c0c410e99d96f67 (patch)
treea0fdd1437353a2b8324a1904e29c8939f64df807 /merge.c
parentgit-p4: python3: use print() function (diff)
downloadtgif-db2d997efa43596fe5860d1b1c0c410e99d96f67.tar.xz
git-p4: python3: fix octal constants
See PEP3127. Works fine with python2 as well. Signed-off-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions