Merge branch 'jn/maint-test-merge-verify-parents'
commitbd9a2688454c09431101869e75c5a47f08c05b1a
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2011 18:38:10 +0000 (11 11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 May 2011 18:38:10 +0000 (11 11:38 -0700)
treeff7c1617523c73a095569449643e99b2ddda08c1
parent0c529e44d3ddd5c947ed33eace8ec6818e47afcb
parent3fc0dbf00ba5191c6aa7090a19fb9324ca348077
Merge branch 'jn/maint-test-merge-verify-parents'

* jn/maint-test-merge-verify-parents:
  tests: teach verify_parents to check for extra parents
  tests: eliminate unnecessary setup test assertions
t/t7600-merge.sh