Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-tools.t
changeset 48584 74973a6d4e67
parent 48575 c852950f0e72
child 48587 3c8cc987672e 
--- a/tests/test-merge-tools.t	Thu Jan 20 13:43:43 2022 -0800
+++ b/tests/test-merge-tools.t	Thu Jan 20 14:13:12 2022 -0800
@@ -1226,7 +1226,7 @@
   <<<<<<< working copy: ef83787e2614 - test: revision 1
   revision 1
   space
-  ||||||| base
+  ||||||| base:         ffd2bda21d6e - test: revision 0
   revision 0
   space
   =======
@@ -1242,7 +1242,7 @@
   <<<<<<< working copy: ef83787e2614 - test: revision 1
   revision 1
   space
-  ||||||| base
+  ||||||| base:         ffd2bda21d6e - test: revision 0
   revision 0
   space
   =======
@@ -1264,7 +1264,7 @@
   $ hg merge -r 4 --config merge-tools.true.premerge=keep-mergediff
   merging f
   <<<<<<<
-  ------- base
+  ------- base:         ffd2bda21d6e - test: revision 0
   +++++++ working copy: ef83787e2614 - test: revision 1
   -revision 0
   +revision 1
@@ -1280,7 +1280,7 @@
   $ aftermerge
   # cat f
   <<<<<<<
-  ------- base
+  ------- base:         ffd2bda21d6e - test: revision 0
   +++++++ working copy: ef83787e2614 - test: revision 1
   -revision 0
   +revision 1
mercurial