--- a/tests/test-merge-local.t Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-merge-local.t Fri Oct 09 13:54:52 2015 -0700
@@ -62,8 +62,7 @@
$ hg co 0
merging zzz1_merge_ok
merging zzz2_merge_bad
- warning: conflicts during merge.
- merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
@@ -87,8 +86,7 @@
$ hg co
merging zzz1_merge_ok
merging zzz2_merge_bad
- warning: conflicts during merge.
- merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
3 files updated, 1 files merged, 2 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
@@ -96,8 +94,7 @@
$ hg co 0
merging zzz1_merge_ok
merging zzz2_merge_bad
- warning: conflicts during merge.
- merging zzz2_merge_bad incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]