changeset 35384 | b9bdee046cc2 |
parent 34865 | a0100f34e20b |
child 35393 | 4441705b7111 |
--- a/tests/test-rebase-conflicts.t Mon Dec 11 22:38:31 2017 +0900 +++ b/tests/test-rebase-conflicts.t Sun Dec 10 22:39:46 2017 -0800 @@ -235,6 +235,7 @@ $ hg rebase -s9 -d2 --debug # use debug to really check merge base used rebase onto 4bc80088dc6b starting from e31216eec445 + rebasing on disk rebase status stored rebasing 9:e31216eec445 "more changes to f1" future parents are 2 and -1