The ui.merge=internal:local does not work

Mathieu Clabaut mathieu.clabaut at gmail.com
Tue Mar 3 04:15:33 CST 2009


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. Any tips on how I can
achieve this goal (Which IMO would deserve a simple and documented
user interface)

My .hgrc contains :
[merge-tools]
xmlmerge.priority = 10
xmlmerge.executable = tdm
xmlmerge.premerge = False
xmlmerge.args = -m \"$base\" \"$local\" \"$other\" \"$output\"

bprmerge.priority = 10
bprmerge.executable = $HOME/deploy/merge/prmerge.py
bprmerge.premerge = False
bprmerge.args = -v -d -p other -b \"$base\" -l \"$local\" -o
\"$other\" --output \"$output\"

gvimdiff.args=--nofork -d -g -O $local $other $base
gvimdiff.regkey=Software\Vim\GVim
gvimdiff.regname=path
gvimdiff.premerge=True
gvimdiff.priority=100
xemacs.checkchanged=True
xemacs.checkconflicts=True

xemacs.arg=-q --no-site-file --eval "(ediff-merge-with-ancestor
\"$local\" \"$other\" \"$base\" nil \"$output\")"
xemacs.priority=0
xemacs.checkchanged=True
xemacs.checkconflicts=True

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


More information about the Mercurial mailing list