Mercurial > hg
diff tests/test-update-branches.t @ 48590:7e503eff3c76
update: set custom conflict label for base commit
Differential Revision: https://phab.mercurial-scm.org/D12022
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 18 Jan 2022 13:23:49 -0800 |
| parents | 74973a6d4e67 |
| children | fbf7e383e961 |
line wrap: on
line diff
--- a/tests/test-update-branches.t Tue Jan 18 15:04:55 2022 -0800 +++ b/tests/test-update-branches.t Tue Jan 18 13:23:49 2022 -0800 @@ -292,14 +292,14 @@ # To mark files as resolved: hg resolve --mark FILE $ cat a - <<<<<<< working copy: 6efa171f091b - test: 3 + <<<<<<< working copy: 6efa171f091b - test: 3 three dirty - ||||||| base: 6efa171f091b - test: 3 + ||||||| working copy parent: 6efa171f091b - test: 3 three ======= four - >>>>>>> destination: d047485b3896 b1 - test: 4 + >>>>>>> destination: d047485b3896 b1 - test: 4 $ rm a.orig $ echo 'update.check = noconflict' >> .hg/hgrc