changeset 31235 | 749b057b01f3 |
parent 30469 | ce3a133f71b3 |
child 31236 | cf8ad0e6c0e4 |
--- a/tests/test-rebase-conflicts.t Tue Mar 07 14:04:29 2017 -0800 +++ b/tests/test-rebase-conflicts.t Tue Mar 07 16:30:31 2017 -0800 @@ -218,6 +218,7 @@ $ hg rebase -s9 -d2 --debug # use debug to really check merge base used rebase onto 4bc80088dc6b starting from e31216eec445 + rebase status stored ignoring null merge rebase of 3 ignoring null merge rebase of 4 ignoring null merge rebase of 6