Mercurial > hg
diff tests/test-merge-changedelete.t @ 48589:a51c522c0064
merge: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12021
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 18 Jan 2022 15:04:55 -0800 |
| parents | 74973a6d4e67 |
| children |
line wrap: on
line diff
--- a/tests/test-merge-changedelete.t Tue Jan 18 14:57:15 2022 -0800 +++ b/tests/test-merge-changedelete.t Tue Jan 18 15:04:55 2022 -0800 @@ -680,12 +680,12 @@ changed --- file3 --- 3 - <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, chan... + <<<<<<< working copy: 13910f48cf7b - test: changed file1, removed file2, c... changed2 - ||||||| base: ab57bf49aa27 - test: added files + ||||||| common ancestor: ab57bf49aa27 - test: added files ======= changed1 - >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, chan... + >>>>>>> merge rev: 10f9a0a634e8 - test: removed file1, changed file2, c... Exercise transitions between local, other, fail and prompt, and make sure the dirstate stays consistent. (Compare with each other and to the above