Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | t6416: correct expectation for rename/rename(1to2) + directory/file | Elijah Newren | 2020-10-26 | 1 | -2/+2 |
* | merge tests: expect improved directory/file conflict handling in ort | Elijah Newren | 2020-10-26 | 1 | -53/+132 |
* | t/: new helper for tests that pass with ort but fail with recursive | Elijah Newren | 2020-10-26 | 1 | -5/+6 |
* | t6416, t6423: clarify some comments and fix some typos | Elijah Newren | 2020-08-10 | 1 | -1/+1 |
* | t6416, t6422: fix incorrect untracked file count | Elijah Newren | 2020-08-10 | 1 | -1/+1 |
* | Collect merge-related tests to t64xx | Elijah Newren | 2020-08-10 | 1 | -0/+1820 |