summaryrefslogtreecommitdiff
path: root/t/t6422-merge-rename-corner-cases.sh
AgeCommit message (Expand)Author
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19t64*: preemptively adjust alignment to prepare for `master` -> `main`Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2020-10-26merge tests: expect improved directory/file conflict handling in ortElijah Newren
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveElijah Newren
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesElijah Newren
2020-08-10t6422, t6426: be more flexible for add/add conflicts involving renamesElijah Newren
2020-08-10t6422: fix multiple errors with the mod6 test expectationsElijah Newren
2020-08-10t6416, t6422: fix incorrect untracked file countElijah Newren
2020-08-10t6422: fix bad check against missing fileElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren