diff tests/test-rebase-collapse.t @ 48588:402a6b6173e9

rebase: set custom conflict label for base commit

Differential Revision: https://phab.mercurial-scm.org/D12020

--- a/tests/test-rebase-collapse.t	Thu Jan 20 11:06:52 2022 -0800
+++ b/tests/test-rebase-collapse.t	Tue Jan 18 14:57:15 2022 -0800
@@ -717,13 +717,13 @@
   o  0: 4a2df7238c3b 'A'
   
   $ cat A
-  <<<<<<< dest:   82b8abf9c185 D - test: D
+  <<<<<<< dest:             82b8abf9c185 D - test: D
   D
-  ||||||| base:   4a2df7238c3b A - test: A
+  ||||||| parent of source: 4a2df7238c3b A - test: A
   A
   =======
   B
-  >>>>>>> source: f899f3910ce7 B - test: B
+  >>>>>>> source:           f899f3910ce7 B - test: B
   $ echo BC > A
   $ hg resolve -m
   (no more unresolved files)
@@ -745,13 +745,13 @@
   o  0: 4a2df7238c3b 'A'
   
   $ cat A
-  <<<<<<< dest:   82b8abf9c185 D - test: D
+  <<<<<<< dest:             82b8abf9c185 D - test: D
   BC
-  ||||||| base:   f899f3910ce7 B - test: B
+  ||||||| parent of source: f899f3910ce7 B - test: B
   B
   =======
   C
-  >>>>>>> source: 63668d570d21 C tip - test: C
+  >>>>>>> source:           63668d570d21 C tip - test: C
   $ echo BD > A
   $ hg resolve -m
   (no more unresolved files)