Mercurial > public > mercurial-scm > hg

diff tests/test-backout.t @ 21947:b081decd9062 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: add parenthesis around "no more unresolved files" message This message may be confused with an error message. Adding parenthesis around it will make it more recognisable as an informative message.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Sat, 26 Jul 2014 03:32:49 +0200
parents 51035af2c0bf
children 7cfe58983bff
line wrap: on
line diff
--- a/tests/test-backout.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-backout.t	Sat Jul 26 03:32:49 2014 +0200
@@ -517,7 +517,7 @@
   merging foo
   my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
    premerge successful
-  no more unresolved files
+  (no more unresolved files)
   $ hg status
   M foo
   ? foo.orig