Mercurial > hg
comparison tests/test-rebase-bookmarks.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 | ca275f7ec576 |
| children | 328afbad6e57 |
comparison
equal
deleted
inserted
replaced
| 21946:868e2cea3ea0 | 21947:b081decd9062 |
|---|---|
| 167 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | 167 merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
| 168 unresolved conflicts (see hg resolve, then hg rebase --continue) | 168 unresolved conflicts (see hg resolve, then hg rebase --continue) |
| 169 [1] | 169 [1] |
| 170 $ echo 'c' > c | 170 $ echo 'c' > c |
| 171 $ hg resolve --mark c | 171 $ hg resolve --mark c |
| 172 no more unresolved files | 172 (no more unresolved files) |
| 173 $ hg rebase --continue | 173 $ hg rebase --continue |
| 174 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob) | 174 saved backup bundle to $TESTTMP/a3/.hg/strip-backup/3d5fa227f4b5-backup.hg (glob) |
| 175 $ hg tglog | 175 $ hg tglog |
| 176 @ 4: 'C' bookmarks: Y Z | 176 @ 4: 'C' bookmarks: Y Z |
| 177 | | 177 | |