changeset 21267 | e4f451c8c05c |
parent 21266 | 19d6fec60b81 |
child 21947 | b081decd9062 |
--- a/tests/test-rebase-interruptions.t Fri Apr 18 22:19:25 2014 -0700 +++ b/tests/test-rebase-interruptions.t Fri May 09 14:46:50 2014 -0500 @@ -104,7 +104,7 @@ $ echo 'conflict solved' > A $ rm A.orig $ hg resolve -m A - no unresolved files; you may continue your unfinished operation + no more unresolved files $ hg rebase --continue warning: new changesets detected on source branch, not stripping