summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
AgeCommit message (Collapse)AuthorFilesLines
2008-07-13Add a new test for git-merge-resolveLibravatar Miklos Vajna1-0/+46
Actually this is a simple test, just to ensure merge-resolve properly calls read-tree. read-tree itself already has more complex tests. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>