summaryrefslogtreecommitdiff
path: root/t/t6423-merge-rename-directories.sh
AgeCommit message (Expand)Author
2020-10-26t6423: add more details about direct resolution of directoriesElijah Newren
2020-10-26t6423: note improved ort handling with untracked filesElijah Newren
2020-10-26t6423, t6436: note improved ort handling with dirty filesElijah Newren
2020-10-26t6423: expect improved conflict markers labels in the ort backendElijah Newren
2020-10-26t6404, t6423: expect improved rename/delete handling in ort backendElijah Newren
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-10-16t6423: more involved rules for renaming directories into each otherElijah Newren
2020-10-16t6423: update directory rename detection tests with new ruleElijah Newren
2020-10-16t6423: more involved directory rename testElijah Newren
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesElijah Newren
2020-08-10t6423: add an explanation about why one of the tests does not passElijah Newren
2020-08-10t6416, t6423: clarify some comments and fix some typosElijah Newren
2020-08-10t6423: fix test setup for a couple testsElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren