The ui.merge=internal:local does not work

[Mathieu Clabaut]

On Tue, Mar 3, 2009 at 12:15, Mads Kiilerich <mads at kiilerich.com> wrote:
> Mathieu Clabaut wrote:
>>
>> Ok, This is my problem... I'll update the wiki tip  about that...
Done.

>> Now, do you know of any way to do a merge while keeping local changes,
>> even when there are some merge configuration in .hgrc ?
> HGMERGE=internal:local hg merge

Thank you, I'll try it next time...
Would it make a sens to propose a patch adding some options to "hg
merge", in order to integrate such a feature to mercurial user
interface ?

-Mathieu