summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2011-11-15 22:29:37 +0530
committerJunio C Hamano <gitster@pobox.com>2011-11-15 16:09:02 -0800
commit7356b51e4bd07893256d76468d301dc244f4299d (patch)
tree112abb2c68193dc5ffa50c0eb2eee22ac87ab736 /mergetools
parent620771c83ec67c7f066d366acbc2efdfa75e7d14 (diff)
downloadgit-7356b51e4bd07893256d76468d301dc244f4299d.tar.gz
convert: don't mix enum with int
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions