changeset 40337 | cb516a854bc7 |
parent 36079 | a2a6e724d61a |
child 42613 | 35ebdbb38efb |
--- a/tests/test-narrow-rebase.t Wed Oct 17 22:32:50 2018 +0800 +++ b/tests/test-narrow-rebase.t Wed Oct 10 17:36:59 2018 +0300 @@ -86,7 +86,6 @@ $ hg update -q 'desc("conflicting outside/f1")' $ hg phase -f -d . - no phases changed $ hg rebase -d 'desc("modify outside/f1")' rebasing 4:707c035aadb6 "conflicting outside/f1" abort: conflict in file 'outside/f1' is outside narrow clone