t7607: use test-lib functions and check MERGE_HEAD
authorClemens Buchacher <drizzd@aon.at>
Sun, 10 Oct 2010 08:35:43 +0000 (10:35 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 16:09:56 +0000 (08:09 -0800)
commit18a1d89...3b9ee769761fa6a43c9bd6f76363421f
tree5661881...903a53dbaabd55cde64fc6ba1ea7ef5ecopy hash to clipboard (tree)
parent40d675f...17f7b0be7b9367752701bf6bc03db091copy hash to clipboard (diff)
t/t7607-merge-overwrite.sh