diff --git a/tests/test-rebase.t b/tests/test-rebase.t --- a/tests/test-rebase.t +++ b/tests/test-rebase.t @@ -86,6 +86,7 @@ $ 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