summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-30 11:17:59 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-30 11:17:59 -0800
commit2e4f04fae6810161c17bf456124b364ad927c499 (patch)
treea9e15370fae2d83439eb1f3ae6a2b44fab41bfd8 /merge.c
parenta235e85cc8bc308a7dbf414f6594a9d309f13289 (diff)
downloadgit-2e4f04fae6810161c17bf456124b364ad927c499.tar.gz
INSTALL: git-p4 does not support Python 3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions