summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
AgeCommit message (Expand)AuthorFilesLines
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Libravatar Nanako Shiraishi1-1/+1
2008-08-23merge: fix numerus bugs around "trivial merge" areaLibravatar Junio C Hamano1-1/+3
2008-07-13Add a new test for git-merge-resolveLibravatar Miklos Vajna1-0/+46