--- a/tests/test-conflict.t Sun Oct 11 15:04:00 2015 -0700
+++ b/tests/test-conflict.t Fri Oct 09 13:54:52 2015 -0700
@@ -36,8 +36,7 @@
$ hg merge 1
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (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]
@@ -73,8 +72,7 @@
$ hg merge 1
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (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]
@@ -105,8 +103,7 @@
> EOF
$ hg -q merge 1
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1]
$ cat a
@@ -148,8 +145,7 @@
> EOF
$ hg -q --encoding utf-8 merge 1
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
[1]
$ cat a
@@ -176,8 +172,7 @@
$ hg merge 1
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (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]
@@ -205,8 +200,7 @@
$ hg merge 1 --tool internal:merge3
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (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]
@@ -251,8 +245,7 @@
$ hg merge
merging a
- warning: conflicts during merge.
- merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+ warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
1 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]