Mercurial > public > mercurial-scm > hg-stable
diff tests/test-annotate.t @ 48606:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 20 Jan 2022 14:13:12 -0800 |
| parents | 50de08904c63 |
| children | a51c522c0064 |
line wrap: on
line diff
--- a/tests/test-annotate.t Thu Jan 20 13:43:43 2022 -0800 +++ b/tests/test-annotate.t Thu Jan 20 14:13:12 2022 -0800 @@ -225,7 +225,7 @@ b4 c b5 - ||||||| base + ||||||| base: 3086dbafde1c - test: b ======= b4 b5 @@ -750,7 +750,7 @@ <<<<<<< working copy: 863de62655ef - test: baz:3+->3- 3- baz:3 4 baz:4 - ||||||| base + ||||||| base: 56fc739c091f - test: baz:3->3+ 3+ baz:3 4 baz:4 ======= @@ -797,7 +797,7 @@ <<<<<<< working copy: cb8df70ae185 - test: qux:4->4+ 3+ baz:3 4+ baz:4 - ||||||| base + ||||||| base: 56fc739c091f - test: baz:3->3+ 3+ baz:3 4 baz:4 ======= @@ -1176,7 +1176,7 @@ 1 2 3 - ||||||| base + ||||||| base: 1ed24be7e7a0 - test: 2 1 2 =======