changeset 46180 | b7ccdb52e0f9 |
parent 46179 | 11f3d4458e3a |
child 47785 | 324c8a299324 |
--- a/tests/test-rebase-inmemory.t Sat Dec 26 18:04:30 2020 +0530 +++ b/tests/test-rebase-inmemory.t Sat Dec 26 18:26:32 2020 +0530 @@ -342,9 +342,7 @@ $ hg reb -r . -d '.^' -n starting dry-run rebase; repository will not be changed nothing to rebase - dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase - abort: no rebase in progress - [20] + [1] Check dryrun gives correct results when there is no conflict in rebasing $ hg rebase -s 2 -d 6 -n