How to Use WinMerge as the Diff tool for Mercurial

Posted by quanticle on Super User See other posts from Super User or by quanticle
Published on 2009-08-17T04:12:34Z Indexed on 2010/05/05 3:48 UTC
Read the original article Hit count: 420

Filed under:

diff

|

winmerge

|

mercurial

I'm using the Mercurial distributed version control system, and I'm wondering how I can configure it to use WinMerge instead of its own internal diff tool. I've already got WinMerge as the merge tool, but I want Mercurial to use WinMerge when I type:

hg diff

Is there any way of doing that, or am I stuck with Mercurial's internal diff tool?

© Super User or respective owner

Related posts about diff

newline-ignoring diff / diff across multiple lines / reflow-ignoring diff

as seen on Stack Overflow - Search for 'Stack Overflow'
Does anybody know of a diff-like tool that can show me the changes between two text files, but ignore changes in whitespace including newlines? Here's an example: the quick brown fox jumped over the lazy bear. the quick brown fox jumped over the lazy bear. the quick brown fox jumped over the… >>> More
Unix diff to only print relevant diff

as seen on Stack Overflow - Search for 'Stack Overflow'
I have these two files File:11 11 12345 File:22 123 456 Output of diff 11 22 2c2 < 456123 --- > 789 Output to be < 456123 > 789 I want it to not print 2c2 and "--" line. I looked at the man page but could not locate any help. Any ideas? The file has more than 1K lines >>> More
How to make meld prefer an SVN diff over a CVS diff

as seen on Stack Overflow - Search for 'Stack Overflow'
We have some directories that are tracked in both CVS and SVN (loooong story). When I change a file in one of these and run meld it diffs it against the SVN version. However for some of the other developers it diffs against CVS. Is there a way to specify which one gets priority? Everyone is using… >>> More
Is there a JS diff library against htmlstring just like google-diff-match-patch on plain text?

as seen on Stack Overflow - Search for 'Stack Overflow'
Currently I am using google-diff-match-patch to implement a real-time editing tool, which can synchronize texts between multiple users. Everything works great when operations are only plain texts, each user's operation(add/delete texts) could be diff-ed out by comparing to old text snapshot with the… >>> More
Paragraph-based diff program?

as seen on Stack Overflow - Search for 'Stack Overflow'
Does anyone know of a diff viewer or comparison program that can do paragraph-based differentials? My repos has a large number of LaTeX files that are formatted into 80-character wide paragraphs (for easy editing with vim). It's currently very difficult to interpret the diffs between various versions… >>> More

Related posts about winmerge

Ignoring svn folders in WinMerge

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm trying to recursively compare two subversion working copy folders using WinMerge. Unfortunately, WinMerge displays lots of differencing files inside of the subversion control folders (.svn or _svn). Is it possible to somehow exclude the subversion folders from the comparision? Or is there another… >>> More
How to use Winmerge with Git Extensions?

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm using Git Extensions and it pre-installs and sets up KDiff as the diff tool to solve merge conflicts. I'm very fond of Winmerge though and would like to replace KDiff with Winmerge. In the Git Extensions settings, there are settings to change the Mergetool, but I can't seem to figure out what… >>> More
How to diff custom file list with WinMerge

as seen on Stack Overflow - Search for 'Stack Overflow'
Hello, I have a code directory structure, which is this: modudle1 trunk pom.xml branches 1.1 pom.xml modudle2 trunk pom.xml submodule-2.1 pom.xml submodule-2.2 pom.xml branches 1.1 pom.xml submodule-2… >>> More
Winmerge : how to ignore differences in lines with a special ending tag

as seen on Stack Overflow - Search for 'Stack Overflow'
I would like to ignore difference in lines, if one of the files has a line ending with //ignore is this possible? how would the regular expression for the line filter be written? tried .*//ignore$ but this does not work >>> More
How to Use WinMerge as the Diff tool for Mercurial

as seen on Super User - Search for 'Super User'
I'm using the Mercurial distributed version control system, and I'm wondering how I can configure it to use WinMerge instead of its own internal diff tool. I've already got WinMerge as the merge tool, but I want Mercurial to use WinMerge when I type: hg diff Is there any way of doing that, or… >>> More