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
branchstable
changeset 48967 a54a866349ed
parent 48966 b10a944c0486 
--- a/tests/test-merge-tools.t	Tue Mar 15 13:40:45 2022 -0700
+++ b/tests/test-merge-tools.t	Tue Mar 15 13:31:39 2022 -0700
@@ -1225,12 +1225,8 @@
   merging f
   revision 0
   space
-  <<<<<<< working copy: ef83787e2614 - test: revision 1 (known-bad-output !)
   revision 1
   space
-  ======= (known-bad-output !)
-  revision 4 (known-bad-output !)
-  >>>>>>> merge rev:    81448d39c9a0 - test: revision 4 (known-bad-output !)
   revision 4
   <<<<<<< working copy: ef83787e2614 - test: revision 1
   revision 1
mercurial