summaryrefslogtreecommitdiff
path: root/t/t3031-merge-criscross.sh
AgeCommit message (Expand)AuthorFilesLines
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-95/+0
2018-08-06t3031: update test description to mention desired behaviorLibravatar Elijah Newren1-1/+1
2015-03-25t: fix some trivial cases of ignored exit codes in loopsLibravatar Jeff King1-1/+1
2009-05-09merge-recursive: never leave index unmerged while recursingLibravatar Dave Olszewski1-0/+95