internal:merge and binary file conflicts

[Steve Borho]

On Fri, Jun 19, 2009 at 12:15 AM, Pavel Shevaev<pacha.shevaev at gmail.com> wrote:
> It looks like for some reason mytextmerge tools is completely ignored.
> I commented out mybinmerge leaving only mytextmerge and now conflicts
> in text files are resolved via some default tool(in my case it's
> k3diff on Windows) not via mytextmerge

using hg --debug merge is often helpful in these cases.

--
Steve Borho