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-internal-tools-pattern.t
changeset 48566 50de08904c63
parent 35704 41ef02ba329b
child 49621 55c6ebd11cb9 
--- a/tests/test-merge-internal-tools-pattern.t	Fri Jan 14 08:44:36 2022 -0800
+++ b/tests/test-merge-internal-tools-pattern.t	Fri Jan 14 09:28:44 2022 -0800
@@ -130,7 +130,7 @@
 
   $ hg merge 3
   merging f
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ cat f
mercurial