summaryrefslogtreecommitdiffstats
path: root/t/t3031-merge-criscross.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* Collect merge-related tests to t64xxElijah Newren2020-08-111-95/+0
* t3031: update test description to mention desired behaviorElijah Newren2018-08-061-1/+1
* t: fix some trivial cases of ignored exit codes in loopsJeff King2015-03-251-1/+1
* merge-recursive: never leave index unmerged while recursingDave Olszewski2009-05-101-0/+95