summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
AgeCommit message (Expand)Author
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-08-24merge: fix numerus bugs around "trivial merge" areaJunio C Hamano
2008-07-13Add a new test for git-merge-resolveMiklos Vajna