Mercurial > public > mercurial-scm > hg

diff tests/test-commit-amend.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 9c35f3a8cac4
children f5ff18f65b73
line wrap: on
line diff
--- a/tests/test-commit-amend.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-commit-amend.t	Sat Jul 26 03:32:49 2014 +0200
@@ -586,7 +586,7 @@
   merging cc incomplete! (edit conflicts, then use 'hg resolve --mark')
   [1]
   $ hg resolve -m cc
-  no more unresolved files
+  (no more unresolved files)
   $ hg ci -m 'merge bar'
   $ hg log --config diff.git=1 -pr .
   changeset:   23:93cd4445f720