From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 May 2011 18:38:10 +0000 (-0700)
Subject: Merge branch 'jn/maint-test-merge-verify-parents'
X-Git-Tag: v1.7.6-rc0~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd9a2688454c09431101869e75c5a47f08c05b1a;p=thirdparty%2Fgit.git

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
---

bd9a2688454c09431101869e75c5a47f08c05b1a