branch | stable |
changeset 21947 | b081decd9062 |
parent 21267 | e4f451c8c05c |
child 23517 | 4f18e80d9c30 |
--- a/tests/test-rebase-interruptions.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-rebase-interruptions.t Sat Jul 26 03:32:49 2014 +0200 @@ -104,7 +104,7 @@ $ echo 'conflict solved' > A $ rm A.orig $ hg resolve -m A - no more unresolved files + (no more unresolved files) $ hg rebase --continue warning: new changesets detected on source branch, not stripping