summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
Commit message (Expand)AuthorAgeFilesLines
* builtin/merge.c: fix a bug with trivial mergesen/merge-trivial-fixElijah Newren2016-04-121-1/+1
* t7605: add a testcase demonstrating a bug with trivial mergesElijah Newren2016-04-121-1/+5
* tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi2008-09-031-1/+1
* merge: fix numerus bugs around "trivial merge" areaJunio C Hamano2008-08-231-1/+3
* Add a new test for git-merge-resolveMiklos Vajna2008-07-131-0/+46