--- a/tests/test-merge7.t Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-merge7.t Fri Oct 09 13:54:52 2015 -0700
@@ -44,8 +44,7 @@
(run 'hg heads' to see heads, 'hg merge' to merge)
$ hg merge
merging test.txt
- warning: conflicts during merge.
- merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]
@@ -91,8 +90,7 @@
my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
picked tool ':merge' for test.txt (binary False symlink False)
my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118
- warning: conflicts during merge.
- merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging test.txt! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
[1]