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

Junio C Hamano committed May 11, 2011 at 11:38 UTC bd9a2688454c09431101869e75c5a47f08c05b1a

No changes.