Mercurial > hg

diff tests/test-rebase-conflicts.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 cb15835456cb
children 328afbad6e57
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-rebase-conflicts.t	Sat Jul 26 03:32:49 2014 +0200
@@ -77,7 +77,7 @@
 
   $ echo 'resolved merge' >common
   $ hg resolve -m common
-  no more unresolved files
+  (no more unresolved files)
   $ hg rebase --continue
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)