summaryrefslogtreecommitdiff
path: root/advice.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-11 11:38:10 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-11 11:38:10 -0700
commitbd9a2688454c09431101869e75c5a47f08c05b1a (patch)
treeff7c1617523c73a095569449643e99b2ddda08c1 /advice.c
parentMerge branch 'vh/config-interactive-singlekey-doc' (diff)
parenttests: teach verify_parents to check for extra parents (diff)
downloadtgif-bd9a2688454c09431101869e75c5a47f08c05b1a.tar.xz
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
Diffstat (limited to 'advice.c')
0 files changed, 0 insertions, 0 deletions