Mercurial > hg-stable
diff tests/test-histedit-fold.t @ 21947:b081decd9062 stable
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 | e4f451c8c05c |
| children | 9ac98c2aa95c d2a5986cb89d |
line wrap: on
line diff
--- a/tests/test-histedit-fold.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-histedit-fold.t Sat Jul 26 03:32:49 2014 +0200 @@ -217,7 +217,7 @@ U file $ hg revert -r 'p1()' file $ hg resolve --mark file - no more unresolved files + (no more unresolved files) $ hg histedit --continue 0 files updated, 0 files merged, 0 files removed, 0 files unresolved saved backup bundle to $TESTTMP/*-backup.hg (glob) @@ -277,7 +277,7 @@ > 5 > EOF $ hg resolve --mark file - no more unresolved files + (no more unresolved files) $ hg commit -m '+5.2' created new head $ echo 6 >> file