Mercurial > hg
diff tests/test-fastannotate-hg.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 | 42d2b31cee0b |
line wrap: on
line diff
--- a/tests/test-fastannotate-hg.t Tue Jan 18 14:57:15 2022 -0800 +++ b/tests/test-fastannotate-hg.t Tue Jan 18 15:04:55 2022 -0800 @@ -165,16 +165,16 @@ a a a - <<<<<<< working copy: 5fbdc1152d97 - test: b2.1 + <<<<<<< working copy: 5fbdc1152d97 - test: b2.1 b4 c b5 - ||||||| base: 3086dbafde1c - test: b + ||||||| common ancestor: 3086dbafde1c - test: b ======= b4 b5 b6 - >>>>>>> merge rev: 37ec9f5c3d1f - test: b2 + >>>>>>> merge rev: 37ec9f5c3d1f - test: b2 $ cat <<EOF > b > a > a @@ -789,16 +789,16 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') [1] $ cat a - <<<<<<< working copy: 0a068f0261cf - test: 3 + <<<<<<< working copy: 0a068f0261cf - test: 3 1 2 3 - ||||||| base: 1ed24be7e7a0 - test: 2 + ||||||| common ancestor: 1ed24be7e7a0 - test: 2 1 2 ======= a - >>>>>>> merge rev: 9409851bc20a - test: a + >>>>>>> merge rev: 9409851bc20a - test: a $ cat > a << EOF > b > 1