--- 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