summaryrefslogtreecommitdiff
path: root/t/t7603-merge-reduce-heads.sh
AgeCommit message (Collapse)AuthorFilesLines
2008-06-30Add new test case to ensure git-merge reduces octopus parents when possibleLibravatar Miklos Vajna1-0/+63
The old shell version used show-branch --independent to filter for the ones that cannot be reached from any other reference. The new C version uses reduce_heads() from commit.c for this, so add test to ensure it works as expected. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>