merge

[Mads Kiilerich]

On 08/22/2011 03:18 AM, Sam Steingold wrote:
> 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:
...
> 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?

See 'hg help merge-tools', 
http://mercurial.selenic.com/wiki/MergeToolConfiguration and 
http://mercurial.selenic.com/wiki/MergeProgram

You can give internal:merge top priority with something like
   [merge-tools]
   internal:merge.priority = 1000

/Mads