The ui.merge=internal:local does not work

[Mathieu Clabaut]

On Tue, Mar 3, 2009 at 18:12, Mads Kiilerich <mads at kiilerich.com> wrote:
> Mathieu Clabaut wrote:
>> It still doesn't work :
>> HGMERGE=internal:other hg merge -r 312
>>  local changed ONI_bak.bpr which remote deleted
>> use (c)hanged version or (d)elete?
>>
>> But it is a bit better, as the configured merge machinery is skipped....
>>
>
> In Mercurial the merge tools are used for merging file content. Merging a
> changed file with a deletion (or change to symlink og directory or some
> other weird case) is something else and at a higher level (a manifest
> merge).

Ok. Thank you for your detail explanations....

-Mathieu