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>
Wed, 13 Oct 2010 21:34:08 +0000 (14:34 -0700)
commit52a0a1b...10f67ffb6d1eec420efed0899c606988
tree6dc34a9...733de3a5b42a00fa199d64e8f3965fc3copy hash to clipboard (tree)
parentc752e7f...e8d96a9673ad248addc9418164bd3ce6copy hash to clipboard (diff)
t/t7607-merge-overwrite.sh