Mercurial > hg
comparison tests/test-rebase-conflicts.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 | cb15835456cb |
| children | 328afbad6e57 |
comparison
equal
deleted
inserted
replaced
| 21946:868e2cea3ea0 | 21947:b081decd9062 |
|---|---|
| 75 | 75 |
| 76 Conclude rebase: | 76 Conclude rebase: |
| 77 | 77 |
| 78 $ echo 'resolved merge' >common | 78 $ echo 'resolved merge' >common |
| 79 $ hg resolve -m common | 79 $ hg resolve -m common |
| 80 no more unresolved files | 80 (no more unresolved files) |
| 81 $ hg rebase --continue | 81 $ hg rebase --continue |
| 82 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) | 82 saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob) |
| 83 | 83 |
| 84 $ hg tglog | 84 $ hg tglog |
| 85 @ 5:secret 'L3' mybook | 85 @ 5:secret 'L3' mybook |