merge

[Sam Steingold]

Hi,
Until recently when I did "hg pull -u" the modified files were
auto-merged cvs-style automatically (the mergeable changes were
correctly merged and the unmergeable changes were "merged" using the
">>>"/"===" markers).
Now mercurial on ubuntu comes with /etc/mercurial/hgrc.d/mergetools.rc:
==========================================
[merge-tools]
kdiff3.args=--auto --L1 base --L2 local --L3 other $base $local $other -o $output
kdiff3.regkey=Software\KDiff3
kdiff3.regappend=\kdiff3.exe
kdiff3.fixeol=True
kdiff3.gui=True
kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child

gvimdiff.args=--nofork -d -g -O $local $other $base
gvimdiff.regkey=Software\Vim\GVim
gvimdiff.regname=path
gvimdiff.priority=-9

......
==========================================
which forces an interactive merge using some vim derivative.
I use emacs and I am not inerested in learning how to use this tool.
My questions are:

1. how do I disable this in ~/.hgrc (I can rm the system-wide file, but
it will be reinstated on next upgrade)?
I want my automatic cvs-style merge!

2. is there a way to tell mercurial to use emacs for merges?

thanks.
-- 
Sam Steingold (http://sds.podval.org/) on Ubuntu 11.04 (natty) X 11.0.11001000
http://www.memritv.org http://www.PetitionOnline.com/tap12009/
http://memri.org http://iris.org.il http://truepeace.org http://pmw.org.il
To iterate is human; to recurse, divine.