diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-10-26 17:01:41 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-26 12:31:24 -0700 |
| commit | c8c35f6a02f3841d4383a5ce4c9d8e426776d151 (patch) | |
| tree | 379488292d01fceabc6548854eb1e87b9e764d61 /Documentation/git-gui.txt | |
| parent | t6423: expect improved conflict markers labels in the ort backend (diff) | |
| download | tgif-c8c35f6a02f3841d4383a5ce4c9d8e426776d151.tar.xz | |
merge tests: expect slight differences in output for recursive vs. ort
The ort merge strategy has some slight differences in commit
descriptions (shortened hashes), stdout vs stderr, and in conflict
messages. Also, builtin/merge.c reports usage of "ort" as "Merge made
by the 'ort' strategy" -- while it is meant as a drop in replacement for
"recursive" it is not yet treated as though it is recursive. Update the
testcases to expect different output for the different merge backends.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-gui.txt')
0 files changed, 0 insertions, 0 deletions