merge conflict automaticall launches xxdiff, but hg diff not

Isaac Jurado diptongo at
Sat Jun 4 13:08:05 CDT 2011

On Sat, Jun 4, 2011 at 5:19 PM, rupert THURNER <rupert.thurner at> wrote:
> On Sat, Jun 4, 2011 at 17:11, Isaac Jurado <diptongo at> wrote:
>> On Sat, Jun 4, 2011 at 2:30 PM, rupert.thurner <rupert.thurner at>
>> 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:
>> > 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.
> this is what i do not fully understand. why the merge tool is known
> "by default" while one would need to configure a graphical diff tool?
> isn't it the same call?

If you are asking about why Ubuntu fires a graphical merge tool
automagically, you should check /etc/mercurial/hgrc.d/mergetools.rc.
You'll see there are a lot defined, as long as one of them is available,
it will be used.


Isaac Jurado

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

More information about the Mercurial mailing list