merge conflict automaticall launches xxdiff, but hg diff not

Isaac Jurado diptongo at gmail.com
Sat Jun 4 10:11:56 CDT 2011


On Sat, Jun 4, 2011 at 2:30 PM, rupert.thurner <rupert.thurner at gmail.com> wrote:
> hi,
>
> is there a possibility so that mercurial is able to launch xxdiff on
> "hg diff" or "hg xxdiff" as well automatically?

See this:

http://mercurial.selenic.com/wiki/ExtdiffExtension

> at least on ubuntu it launches xxdiff automatically, i.e. without
> tinkering with .hgrc, when hitting a merge conflict. which is quite
> nice.

That's the way the merge-tools are configured in Ubuntu: it has a long
list of possibilities and uses whichever is found installed.

http://mercurial.selenic.com/wiki/MergeToolConfiguration

Cheers.

-- 
Isaac Jurado

"The noblest pleasure is the joy of understanding"
Leonardo da Vinci


More information about the Mercurial mailing list