projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c529e4 3fc0dbf)
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)
* jn/maint-test-merge-verify-parents:
  tests: teach verify_parents to check for extra parents
  tests: eliminate unnecessary setup test assertions

1  2 
t/t7600-merge.sh patch | diff1 | diff2 | blob | history

diff --cc t/t7600-merge.sh
Simple merge
Git—the stupid content tracker