| Commit message (Expand) | Author | Age | Files | Lines |
* | t642[23]: be more flexible for add/add conflicts involving pair renames | Elijah Newren | 2020-08-10 | 1 | -6/+12 |
* | t6422, t6426: be more flexible for add/add conflicts involving renames | Elijah Newren | 2020-08-10 | 1 | -8/+13 |
* | t6422: fix multiple errors with the mod6 test expectations | Elijah Newren | 2020-08-10 | 1 | -9/+10 |
* | t6416, t6422: fix incorrect untracked file count | Elijah Newren | 2020-08-10 | 1 | -2/+2 |
* | t6422: fix bad check against missing file | Elijah Newren | 2020-08-10 | 1 | -3/+3 |
* | Collect merge-related tests to t64xx | Elijah Newren | 2020-08-10 | 1 | -0/+1437 |