Mercurial > hg-stable
comparison tests/test-rebase-parameters.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 | d5b04ee8ecf7 |
comparison
equal
deleted
inserted
replaced
| 21946:868e2cea3ea0 | 21947:b081decd9062 |
|---|---|
| 452 | 452 |
| 453 $ hg resolve -l | 453 $ hg resolve -l |
| 454 U c2 | 454 U c2 |
| 455 | 455 |
| 456 $ hg resolve -m c2 | 456 $ hg resolve -m c2 |
| 457 no more unresolved files | 457 (no more unresolved files) |
| 458 $ hg rebase -c --tool internal:fail | 458 $ hg rebase -c --tool internal:fail |
| 459 tool option will be ignored | 459 tool option will be ignored |
| 460 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) | 460 saved backup bundle to $TESTTMP/b3/.hg/strip-backup/*-backup.hg (glob) |
| 461 | 461 |
| 462 $ cd .. | 462 $ cd .. |