[PATCH 5 of 6 mergedriver] test-merge-changedelete.t: add a file with regular merge conflicts

[Martin von Zweigbergk]

On Sat, Nov 28, 2015 at 5:57 PM Siddharth Agarwal <sid at less-broken.com>
wrote:

> On 11/27/15 22:05, Martin von Zweigbergk wrote:
> >
> >
> > On Fri, Nov 27, 2015 at 9:56 PM Siddharth Agarwal <sid0 at fb.com
> > <mailto:sid0 at fb.com>> wrote:
> >
> >     Probably because you have hgmerge in your PATH. Try removing it.
> >
> >
> > Yep, the test pass when I move it out of my PATH.
>
> As followups I'm thinking of sending patches that skip these tests
> whenever 'hgmerge' is in the PATH. Either that or we have a
> internal-only config option that disables 'hgmerge' lookups.
>

 I think you're saying here that it's rare that people have hgmerge on
their PATH (I don't know why I had it), so this is breaking pretty much
only me. Correct? If so, I think the series looks good, so I can queue them.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20151129/725e654f/attachment.html>