Can I change the default comparison tool in Mercurial?

Question

Every time I do "hg diff file.ext", I end up using the diff console application. Is there any way to change this? I cannot find the link in the Mercurial documentation ( I'm not talking about merging! ). I would like to use Kdiff3 or WinMerge (I use Windows).

Answer 1

I solved this with the built-in Mercurial extension ... I just need to add the following lines to Mercurial.ini (in the Mercurial folder):

[extensions] hgext.extdiff= [extdiff] cmd.vdiff = kdiff3 

When I want to use kdiff3 instead of diff, I only need to use:

 hg vdiff file.ext 

Answer 2

Using this configuration

 [extdiff] cmd.kdiff3 = 

I use this command to see diffs:

 hg kdiff 

Shows a directory tree with all modified files. You click on the file to see diff for the file only. You can add a file parameter to a command to see only one file.

More details here .

Answer 3

I had this problem a few minutes ago; I just installed it and added my path (by default in c: \ program files \ kdiff3) to my PATH ev system. I reloaded my window to pick up a new path and "hg kdiff3" just worked. As it turned out, my base file "mercurial.ini" contains the following: this allows kdiff3 to work for all hg repositories in the system.

 [extensions] hgext.extdiff = [extdiff] cmd.kdiff3 = [merge-tools] kdiff3.args = $base $local $other -o $output 

Answer 4

If you are looking for something like git difftool where you do not need to enter file names and see diff for all modified files, add them to ~/.hgrc and run hg difftool .

 [extensions] extdiff = [extdiff] cmd.vimdiff = vimdiff [alias] difftool = !for file in $(hg status -n); do hg vimdiff $file; done