Mercurial > public > mercurial-scm > hg-stable

diff tests/test-annotate.t @ 48611:a51c522c0064

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-annotate.t	Tue Jan 18 14:57:15 2022 -0800
+++ b/tests/test-annotate.t	Tue Jan 18 15:04:55 2022 -0800
@@ -221,16 +221,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
@@ -747,16 +747,16 @@
   0
   1 baz:1
   2 baz:2
-  <<<<<<< working copy: 863de62655ef - test: baz:3+->3-
+  <<<<<<< working copy:    863de62655ef - test: baz:3+->3-
   3- baz:3
   4 baz:4
-  ||||||| base:         56fc739c091f - test: baz:3->3+
+  ||||||| common ancestor: 56fc739c091f - test: baz:3->3+
   3+ baz:3
   4 baz:4
   =======
   3+ baz:3
   4+ baz:4
-  >>>>>>> merge rev:    cb8df70ae185 - test: qux:4->4+
+  >>>>>>> merge rev:       cb8df70ae185 - test: qux:4->4+
   5
   6
   7
@@ -794,16 +794,16 @@
   0
   1 baz:1
   2 baz:2
-  <<<<<<< working copy: cb8df70ae185 - test: qux:4->4+
+  <<<<<<< working copy:    cb8df70ae185 - test: qux:4->4+
   3+ baz:3
   4+ baz:4
-  ||||||| base:         56fc739c091f - test: baz:3->3+
+  ||||||| common ancestor: 56fc739c091f - test: baz:3->3+
   3+ baz:3
   4 baz:4
   =======
   3- baz:3
   4 baz:4
-  >>>>>>> merge rev:    863de62655ef - test: baz:3+->3-
+  >>>>>>> merge rev:       863de62655ef - test: baz:3+->3-
   5
   6
   7
@@ -1172,16 +1172,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