--- a/tests/test-merge-local.t	Tue Dec 08 07:05:37 2015 +0000
+++ b/tests/test-merge-local.t	Mon Dec 07 20:43:24 2015 -0800
@@ -59,6 +59,9 @@
   use 'hg resolve' to retry unresolved file merges
   [1]
 
+  $ hg resolve -m
+  (no more unresolved files)
+
   $ hg co 0
   merging zzz1_merge_ok
   merging zzz2_merge_bad
@@ -83,6 +86,9 @@
 
 Local merge with conflicts:
 
+  $ hg resolve -m
+  (no more unresolved files)
+
   $ hg co
   merging zzz1_merge_ok
   merging zzz2_merge_bad
@@ -91,6 +97,9 @@
   use 'hg resolve' to retry unresolved file merges
   [1]
 
+  $ hg resolve -m
+  (no more unresolved files)
+
   $ hg co 0 --config 'ui.origbackuppath=.hg/origbackups'
   merging zzz1_merge_ok
   merging zzz2_merge_bad
@@ -124,6 +133,9 @@
 
   $ hg revert zzz2_merge_bad
 
+  $ hg resolve -m
+  (no more unresolved files)
+
   $ hg co
   merging zzz1_merge_ok
   4 files updated, 1 files merged, 2 files removed, 0 files unresolved