Age | Commit message (Expand) | Author | Files | Lines |
2021-04-16 | Merge branch 'en/ort-readiness' | Junio C Hamano | 1 | -1/+1 |
2021-04-08 | Merge branch 'en/ort-perf-batch-9' | Junio C Hamano | 1 | -0/+71 |
2021-03-20 | t6423: mark remaining expected failure under merge-ort as such | Elijah Newren | 1 | -1/+1 |
2021-03-10 | merge-ort: precompute subset of sources for which we need rename detection | Elijah Newren | 1 | -0/+71 |
2021-02-10 | tests: remove most uses of C_LOCALE_OUTPUT | Ævar Arnfjörð Bjarmason | 1 | -1/+1 |
2020-10-26 | t6423: add more details about direct resolution of directories | Elijah Newren | 1 | -16/+23 |
2020-10-26 | t6423: note improved ort handling with untracked files | Elijah Newren | 1 | -71/+124 |
2020-10-26 | t6423, t6436: note improved ort handling with dirty files | Elijah Newren | 1 | -114/+152 |
2020-10-26 | t6423: expect improved conflict markers labels in the ort backend | Elijah Newren | 1 | -10/+28 |
2020-10-26 | t6404, t6423: expect improved rename/delete handling in ort backend | Elijah Newren | 1 | -20/+50 |
2020-10-26 | merge tests: expect improved directory/file conflict handling in ort | Elijah Newren | 1 | -15/+38 |
2020-10-26 | t/: new helper for tests that pass with ort but fail with recursive | Elijah Newren | 1 | -6/+7 |
2020-10-16 | t6423: more involved rules for renaming directories into each other | Elijah Newren | 1 | -26/+227 |
2020-10-16 | t6423: update directory rename detection tests with new rule | Elijah Newren | 1 | -21/+123 |
2020-10-16 | t6423: more involved directory rename test | Elijah Newren | 1 | -0/+195 |
2020-08-10 | t642[23]: be more flexible for add/add conflicts involving pair renames | Elijah Newren | 1 | -2/+2 |
2020-08-10 | t6423: add an explanation about why one of the tests does not pass | Elijah Newren | 1 | -0/+8 |
2020-08-10 | t6416, t6423: clarify some comments and fix some typos | Elijah Newren | 1 | -13/+12 |
2020-08-10 | t6423: fix test setup for a couple tests | Elijah Newren | 1 | -0/+2 |
2020-08-10 | Collect merge-related tests to t64xx | Elijah Newren | 1 | -0/+4693 |