summaryrefslogtreecommitdiff
path: root/t/t3031-merge-criscross.sh
Commit message (Expand)AuthorAgeFilesLines
* 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-091-0/+95