summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
AgeCommit message (Expand)Author
2008-07-13Add a new test for git-merge-resolveMiklos Vajna