t7606: fix custom merge test
authorJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 02:23:22 +0000 (19:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 24 Aug 2008 02:23:22 +0000 (19:23 -0700)
commite596cdd...f349b244dca854bf5a7aa9428b48fc50
tree028d41a...fe66425381298839f8e9dea3b2b09a5ecopy hash to clipboard (tree)
parent131f9a1...8bba5a8b0bcba072696653ab3199911acopy hash to clipboard (diff)
t/t7606-merge-custom.sh