branch | stable |
changeset 21947 | b081decd9062 |
parent 21267 | e4f451c8c05c |
child 23515 | 7856a87bbb02 |
--- a/tests/test-rebase-mq-skip.t Fri Jul 25 15:51:42 2014 -0500 +++ b/tests/test-rebase-mq-skip.t Sat Jul 26 03:32:49 2014 +0200 @@ -111,7 +111,7 @@ [1] $ HGMERGE=internal:local hg resolve --all - no more unresolved files + (no more unresolved files) $ hg rebase --continue saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)