![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 May 2011 18:38:10 +0000 (11:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 11 May 2011 18:38:10 +0000 (11:38 -0700) | ||
| commit | bd9a2688454c09431101869e75c5a47f08c05b1a | |
| tree | ff7c1617523c73a095569449643e99b2ddda08c1 | tree | snapshot |
| parent | 0c529e44d3ddd5c947ed33eace8ec6818e47afcb | commit | diff |
| parent | 3fc0dbf00ba5191c6aa7090a19fb9324ca348077 | commit | diff |
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
* 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 | diff1 | | diff2 | | blob | history |