Mercurial > hg
diff tests/test-graft.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 | 44255f7ce886 |
| children | c2863cfe8a8a 9472284df4eb |
line wrap: on
line diff
--- a/tests/test-graft.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-graft.t Sat Jul 26 03:32:49 2014 +0200 @@ -235,7 +235,7 @@ $ echo b > e $ hg resolve -m e - no more unresolved files + (no more unresolved files) Continue with a revision should fail: @@ -370,7 +370,7 @@ [255] $ hg resolve --all merging a - no more unresolved files + (no more unresolved files) $ hg graft -c grafting revision 1 $ hg export tip --git @@ -399,7 +399,7 @@ [255] $ hg resolve --all merging a and b to b - no more unresolved files + (no more unresolved files) $ hg graft -c grafting revision 2 $ hg export tip --git