[PATCH 3 of 4 mergedriver] filemerge: add a 'leave unresolved' option to change/delete prompts

[Martin von Zweigbergk]

On Tue, Dec 1, 2015 at 12:48 PM Siddharth Agarwal <sid0 at fb.com> wrote:

> diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t
> --- a/tests/test-merge-types.t
> +++ b/tests/test-merge-types.t
> @@ -172,8 +172,10 @@ Update to link with local change should
>    (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks)
> (re)
>    picked tool ':prompt' for a (binary False symlink True changedelete
> False)
>    no tool found to merge a
> -  keep (l)ocal, take (o)ther, or leave (u)nresolved? l
> -  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
> +  keep (l)ocal, take (o)ther, or leave (u)nresolved? u
> +  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
> +  use 'hg resolve' to retry unresolved file merges
> +  [1]
>

This hunk surprised me, and it turns out the test case fails. Moving this
to 4/4 in flight.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20151201/324009b0/attachment.html>