simplify output of conflicting merge
authorClemens Buchacher <drizzd@aon.at>
Sun, 5 Apr 2009 00:47:00 +0000 (02:47 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sun, 5 Apr 2009 07:26:33 +0000 (00:26 -0700)
commit39d8e27...f42e976a61f08a4f7bc2047a682ac532
treedbf1f29...e9e8716ae66e903933e9b3a8af0928c1copy hash to clipboard (tree)
parent0eb6574...24241b1e54be1ddff60287544faaf8d8copy hash to clipboard (diff)
merge-recursive.c