Mercurial > hg
changeset 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 | a51c522c0064 |
| children | f1162b125991 |
| files | mercurial/merge.py tests/test-conflict.t tests/test-update-branches.t |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py Tue Jan 18 15:04:55 2022 -0800 +++ b/mercurial/merge.py Tue Jan 18 13:23:49 2022 -0800 @@ -2280,7 +2280,7 @@ ctx.rev(), branchmerge=False, force=False, - labels=[b'working copy', b'destination'], + labels=[b'working copy', b'destination', b'working copy parent'], updatecheck=updatecheck, wc=wc, )
--- a/tests/test-conflict.t Tue Jan 18 15:04:55 2022 -0800 +++ b/tests/test-conflict.t Tue Jan 18 13:23:49 2022 -0800 @@ -308,7 +308,7 @@ 2 3 <<<<<<< - ------- base + ------- working copy parent +++++++ working copy 4 +4.5 @@ -346,7 +346,7 @@ 3.5 4.5 5.5 - ------- base + ------- working copy parent +++++++ destination 3 -4
--- 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