aboutsummaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
Commit message (Expand)AuthorAge
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-03
* merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-23
* Add a new test for git-merge-resolveMiklos Vajna2008-07-13