The ui.merge=internal:local does not work

[Mads Kiilerich]

Mathieu Clabaut wrote:
> Hello I try the following to do a merge while keeping all my changes :
> hg --config "ui.merge=internal:local" merge
>
> But mercurial keeps trying to do the merge. 

I just verified that it works and added a test:
http://www.selenic.com/pipermail/mercurial-devel/2009-March/010641.html

Can you provide exact output for what it is that doesn't work for you. 
Perhaps with

hg -v --debug --config "ui.merge=internal:local" merge


> [merge-patterns]
> **.bpr = bprmerge
> **.bps = internal:local
> **.xml = xmlmerge
> **.svg = xmlmerge
> **.bum = xmlmerge
> **.buc = xmlmerg

Note that merge-patterns will take precedence over the default merge 
tool from ui.merge.

/Mads