Merge branch 'jn/maint-test-merge-verify-parents'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2011 18:38:10 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2011 18:38:10 +0000 (11:38 -0700)
commitbd9a268...454c09431101869e75c5a47f08c05b1a
treeff7c161...523c73a095569449643e99b2ddda08c1copy hash to clipboard (tree)
parent0c529e4...d3ddd5c947ed33eace8ec6818e47afcbcopy hash to clipboard (diff)
parent3fc0dbf...0ba5191c6aa7090a19fb9324ca348077copy hash to clipboard (diff)
t/t7600-merge.sh