[PATCH] subrepo: move prompts out of the if (issue5505)

[Simon Farnsworth]

On 17/03/2017 13:10, Simon Farnsworth wrote:
<snip>
> diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
> --- a/tests/test-subrepo.t
> +++ b/tests/test-subrepo.t
> @@ -349,7 +349,7 @@
>  local removed, remote changed, keep changed
>
>    $ hg merge 6
> -   remote [merge rev] changed subrepository s which local [working copy] removed
> +   remote [merge rev] changed subrepository t which local [working copy] removed
These change because for some reason, the subrepo prompted for was wrong 
before. I'm not clear on why the code motion affected this, and this 
should motivate extra review from someone who's interested in subrepo 
support.

-- 
Simon Farnsworth