Mathieu Clabaut wrote: > Ok, This is my problem... I'll update the wiki tip about that... > 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 /Mads