Mercurial > public > mercurial-scm > hg
diff tests/test-merge-tools.t @ 46139:3ca5ca380a34
filemerge: add support for the new "mergediff" marker style to premerge
This adds support for the new "mergediff" conflict marker style to
"merge-tools.<tool>.premerge" (the new value is called
"keep-mergediff").
Differential Revision: https://phab.mercurial-scm.org/D9606
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 14 Dec 2020 18:09:37 -0800 |
| parents | 976b26bdd0d8 |
| children | 768056549737 |
line wrap: on
line diff
--- a/tests/test-merge-tools.t Mon Dec 14 14:31:15 2020 +0100 +++ b/tests/test-merge-tools.t Mon Dec 14 18:09:37 2020 -0800 @@ -1255,6 +1255,46 @@ # hg resolve --list R f +premerge=keep-mergediff keeps conflict markers with base content: + + $ beforemerge + [merge-tools] + false.whatever= + true.priority=1 + true.executable=cat + # hg update -C 1 + $ hg merge -r 4 --config merge-tools.true.premerge=keep-mergediff + merging f + <<<<<<< + ------- base + +++++++ working copy: ef83787e2614 - test: revision 1 + -revision 0 + +revision 1 + space + ======= merge rev: 81448d39c9a0 - test: revision 4 + revision 4 + >>>>>>> + revision 0 + space + revision 4 + 0 files updated, 1 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + $ aftermerge + # cat f + <<<<<<< + ------- base + +++++++ working copy: ef83787e2614 - test: revision 1 + -revision 0 + +revision 1 + space + ======= merge rev: 81448d39c9a0 - test: revision 4 + revision 4 + >>>>>>> + # hg stat + M f + # hg resolve --list + R f + premerge=keep respects ui.mergemarkers=basic: $ beforemerge