--- a/tests/test-merge-local.t Wed Oct 19 18:06:14 2016 +0200
+++ b/tests/test-merge-local.t Tue Oct 25 21:01:53 2016 +0200
@@ -66,7 +66,7 @@
merging zzz1_merge_ok
merging zzz2_merge_bad
warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
- 2 files updated, 1 files merged, 2 files removed, 1 files unresolved
+ 2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]
@@ -104,7 +104,7 @@
merging zzz1_merge_ok
merging zzz2_merge_bad
warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
- 2 files updated, 1 files merged, 2 files removed, 1 files unresolved
+ 2 files updated, 1 files merged, 3 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
[1]