| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge tests: expect improved directory/file conflict handling in ort | Elijah Newren | 2020-10-26 | 1 | -8/+22 |
| * | t/: new helper for tests that pass with ort but fail with recursive | Elijah Newren | 2020-10-26 | 1 | -3/+4 |
| * | t642[23]: be more flexible for add/add conflicts involving pair renames | Elijah Newren | 2020-08-11 | 1 | -6/+12 |
| * | t6422, t6426: be more flexible for add/add conflicts involving renames | Elijah Newren | 2020-08-11 | 1 | -8/+13 |
| * | t6422: fix multiple errors with the mod6 test expectations | Elijah Newren | 2020-08-11 | 1 | -9/+10 |
| * | t6416, t6422: fix incorrect untracked file count | Elijah Newren | 2020-08-11 | 1 | -2/+2 |
| * | t6422: fix bad check against missing file | Elijah Newren | 2020-08-11 | 1 | -3/+3 |
| * | Collect merge-related tests to t64xx | Elijah Newren | 2020-08-11 | 1 | -0/+1437 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |