changeset 25382 | 6084926366b9 |
parent 25111 | 1ef96a3b8b89 |
child 26165 | 927c0d84e09f |
--- a/tests/test-rebase-parameters.t Mon May 25 16:48:55 2015 -0700 +++ b/tests/test-rebase-parameters.t Fri May 29 22:23:58 2015 +0200 @@ -476,7 +476,7 @@ branch: default commit: 1 modified, 1 unresolved (merge) update: (current) - phases: 3 draft (draft) + phases: 3 draft rebase: 0 rebased, 1 remaining (rebase --continue) $ hg resolve -l