[PATCH 5 of 5] merge.applyupdates: only attempt to merge files in mergeactions

[Martin von Zweigbergk]

On Fri, Nov 13, 2015 at 12:46 AM Siddharth Agarwal <sid at less-broken.com>
wrote:

> On 11/12/15 23:04, Martin von Zweigbergk wrote:
> >
> > After patch 3/5, test-commit-amend.t seems to hang indefinitely. I
> > suspect it's waiting for some mergetool (I'm logged in without X
> > forwarding). I'll drop both of those patches for now until we
> > understand better what happened.
>
> Huh, sorry about that. Do you by any chance have a binary called
> 'hgmerge' in your PATH?
>

Yep, turns out I do.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20151113/4d888705/attachment.html>