summaryrefslogtreecommitdiff
path: root/t/t6036-recursive-corner-cases.sh
AgeCommit message (Expand)Author
2010-09-30t6036: Add testcase for undetected conflictElijah Newren
2010-09-30t6036: Add a second testcase similar to the first but with content changesElijah Newren
2010-09-30t6036: Test index and worktree state, not just that merge failsElijah Newren
2009-07-31merge-recursive: don't segfault while handling rename clashesJunio C Hamano