Mercurial > hg
diff tests/test-merge-internal-tools-pattern.t @ 49956:2282d8ac0fa9
filemerge: add union-other-first as internal merge tool
See inline documentation for details.
| author | Cédric Krier <ced@b2ck.com> |
|---|---|
| date | Thu, 26 Jan 2023 00:23:07 +0100 |
| parents | 55c6ebd11cb9 |
| children |
line wrap: on
line diff
--- a/tests/test-merge-internal-tools-pattern.t Fri Jan 13 00:07:07 2023 +0100 +++ b/tests/test-merge-internal-tools-pattern.t Thu Jan 26 00:23:07 2023 +0100 @@ -140,3 +140,23 @@ third line line 4b line 4a + +Merge using internal:union-other-first tool: + + $ hg update -C 4 + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + + $ echo "[merge-patterns]" > .hg/hgrc + $ echo "* = internal:union-other-first" >> .hg/hgrc + + $ hg merge 3 + merging f + 0 files updated, 1 files merged, 0 files removed, 0 files unresolved + (branch merge, don't forget to commit) + + $ cat f + line 1 + line 2 + third line + line 4a + line 4b