summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
Commit message (Expand)AuthorAgeFilesLines
* Add a new test for git-merge-resolveMiklos Vajna2008-07-131-0/+46