merge conflict automaticall launches xxdiff, but hg diff not

[Isaac Jurado]

On Sat, Jun 4, 2011 at 5:19 PM, rupert THURNER <rupert.thurner at gmail.com> wrote:
> On Sat, Jun 4, 2011 at 17:11, Isaac Jurado <diptongo at gmail.com> wrote:
>>
>> 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
>>
>
> 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.

Cheers.

-- 
Isaac Jurado

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