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-resolve.t
changeset 26614 ef1eb6df7071
parent 26352 e635bc9bb7d9
child 26619 3b213a904b98 
--- a/tests/test-resolve.t	Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-resolve.t	Fri Oct 09 13:54:52 2015 -0700
@@ -134,10 +134,8 @@
 
 resolve --all should re-merge all unresolved files
   $ hg resolve -q --all
-  warning: conflicts during merge.
-  merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
-  warning: conflicts during merge.
-  merging file2 incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
+  warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
   [1]
   $ grep '<<<' file1 > /dev/null
   $ grep '<<<' file2 > /dev/null
@@ -145,8 +143,7 @@
 resolve <file> should re-merge file
   $ echo resolved > file1
   $ hg resolve -q file1
-  warning: conflicts during merge.
-  merging file1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging file1! (edit, then use 'hg resolve --mark')
   [1]
   $ grep '<<<' file1 > /dev/null
mercurial