changeset 19214 | 0250047a365e |
parent 19213 | f324a9b8d4bf |
child 19925 | 9c78ed396075 |
--- a/tests/test-rebase-parameters.t Tue May 14 11:23:17 2013 -0700 +++ b/tests/test-rebase-parameters.t Tue May 14 11:23:17 2013 -0700 @@ -427,6 +427,7 @@ branch: default commit: 1 modified, 1 unresolved (merge) update: (current) + rebase: 0 rebased, 1 remaining (rebase --continue) $ hg resolve -l U c2