diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-10-26 17:01:36 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-26 12:31:23 -0700 |
| commit | f06481f12732e846c0572a0109e2c5b5684f508a (patch) | |
| tree | d757e3872eac53647d2c0f100de08763189ae8b8 /fmt-merge-msg.h | |
| parent | t6423: more involved rules for renaming directories into each other (diff) | |
| download | tgif-f06481f12732e846c0572a0109e2c5b5684f508a.tar.xz | |
t/: new helper for tests that pass with ort but fail with recursive
There are a number of tests that the "recursive" backend does not handle
correctly but which the redesign in "ort" will. Add a new helper in
lib-merge.sh for selecting a different test expectation based on the
setting of GIT_TEST_MERGE_ALGORITHM, and use it in various testcases to
document which ones we expect to fail under recursive but pass under
ort.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions