Merge branch 'jc/conflict-marker-size' into maint
authorJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 05:38:34 +0000 (22:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 10 Apr 2010 05:38:34 +0000 (22:38 -0700)
commitdaaf2e8...92cf3b652454c48ffd332e3c5b446b92
treecdf705c...1efd7e7916bd2bc361274ed26543fa5fcopy hash to clipboard (tree)
parent326bea4...cb7315a7ee8e428dbf6b1052ffb01b00copy hash to clipboard (diff)
parenta757c64...ee78ae21c9e8ac66dcc52e361c15c7d2copy hash to clipboard (diff)
diff.c
t/t4017-diff-retval.sh