tests/test-resolve.t
changeset 21266 19d6fec60b81
parent 21265 232de244ab6f
child 21267 e4f451c8c05c
--- a/tests/test-resolve.t	Fri Apr 18 18:56:26 2014 -0700
+++ b/tests/test-resolve.t	Fri Apr 18 22:19:25 2014 -0700
@@ -39,6 +39,7 @@
 
   $ echo resolved > file
   $ hg resolve -m file
+  no unresolved files; you may continue your unfinished operation
   $ hg commit -m 'resolved'
 
 resolve -l should error since no merge in progress