Request: 'hg import' should produce conflict markers

Jordi GutiƩrrez Hermoso jordigh at
Tue Jul 7 13:13:49 CDT 2015

On Tue, 2015-07-07 at 16:13 +0000, Nathan Ridge wrote:
> If I'm understanding the suggestion correctly, it's to make the
> script (that wraps 'patch --merge' and exits with 0) the ui.patch
> tool.

Oh, I see.

Yeah, that seems reasonable to me too. And fits with our general
philosophy of "don't overcomplicate hg for someone's edge case".

More information about the Mercurial-devel mailing list