Age | Commit message (Expand) | Author |
---|---|---|
2020-10-26 | merge tests: expect improved directory/file conflict handling in ort | Elijah Newren |
2020-10-26 | t/: new helper for tests that pass with ort but fail with recursive | Elijah Newren |
2020-08-11 | t642[23]: be more flexible for add/add conflicts involving pair renames | Elijah Newren |
2020-08-11 | t6422, t6426: be more flexible for add/add conflicts involving renames | Elijah Newren |
2020-08-11 | t6422: fix multiple errors with the mod6 test expectations | Elijah Newren |
2020-08-11 | t6416, t6422: fix incorrect untracked file count | Elijah Newren |
2020-08-11 | t6422: fix bad check against missing file | Elijah Newren |
2020-08-11 | Collect merge-related tests to t64xx | Elijah Newren |