winmerge

I've seen the entries on only showing modified files etc. with difftool but has anyone found a way yet to also show the new files? I still want to see what someone added as part of the commit, even though it's a new file and not a modification. Seems like what difftool needs is to create an empty 'dummy' file so that tools like winmerge have something to 'diff' against. jamiebarrow I too seek the answer to your problem, but I offer some workarounds until that happens. You may be able to try the --dir-diff option, which works alright, but I prefer each change opening in a separate window than

Using Windows, Mercurial, and the extdiff extension (for Mercurial). I was trying to set up extdiff to use WinDiff as an external diff tool, but I think I've narrowed the problem down enough to say that the trouble is before I'm even getting that far. From what I understand of extdiff, it merely calls your cmd.winmerge program, and passes the necessary directories to it. I'm also working off of some assumptions outlined here (which may or may not be accurate; I'm just learning Mercurial): http://bitbucket.org/tortoisehg/stable/issue/457/multiple-extdiff-threads-in-one-process-causes-side

Is there a diff tool that allows me to write regular expression to remove a line from difference? Like, see the two lines: this.Visible = true; Visible = true; And can I write an expression such that if the line difference is exactly this ignore the difference. How do I specifically do that? I give you one more example. Like System.Exception and Exception both are same for me, I don't want to show them in the diff. Greg Hewgill You can do this with KDiff3 . See the documentation section on Preprocessor Commands . Update : I see you have a further request that appears to need a semantic diff

I would like to use WinMerge as the default diff tool inside VS2008 from the solutions explorer in place of the "Compare..." context menu item. Is this possible? I'm looking for a quick replacement of the current bland diff tool an I just like WinMerge better. I'm not interested in going to the folder explorer and doing the comparison there. I'm using Visual Source Safe 6.0 not TFS I have been wondering about this as well and have not found anything to make it possible in VSS 6.0 . For now, it looks like the answer to our question is "No". Yep, it's possible! See this link: http://whyiamright

Is there possibility of copy ONLY difference of two files? Like in winmerge, but, I can't find this option Just like on this screen- i want to copy only 'yellow part' . Of course I can do that manually, but in big file it's not too funny :-) WinMerge has a built-in and simple way to generate such "diff only" files, that they called "patches". Click on "Tool", then on "Generate Patch...", and enter where you want to store the result: You will obtain (for your example) the file 4,8c4,8 < HELLO WORLD < HELLO WORLD < HELLO WORLD < HELLO WORLD < HELLO WORLD --- > > > > > That uses the standard,

When Mercurial is running under cygwin, it's a bit tricky to figure out how to spawn WinMerge to resolve merge conflicts. How can I do this? The trick is that cygwin paths are not the same as Windows paths, so you need a little script that converts the cygwin paths to Windows paths before passing them as arguments to WinMerge. Here's how to do it: (1) Create a shell script in /usr/bin/winmerge as follows: #!/bin/sh "/cygdrive/c/Program Files/WinMerge/WinMergeU.EXE" /e /ub /dl other /dr local `cygpath -aw $1` `cygpath -aw $2` `cygpath -aw $3` Note: cygpath converts path names. If WinMerge isn't

I am trying to set up WinMerge as the Merge tool into TortoiseHG; Here is my Mercurial.ini: ; User specific Mercurial config file. ; See the hgrc man page for details. [ui] username = Bargio <> merge = winmergeu [extdiff] cmd.winmerge = C:\Program Files (x86)\WinMerge\WinMergeU.exe opts.winmerge = /e /x /ub /wl [merge-tools] winmergeu.executable = C:\Program Files (x86)\WinMerge\WinMergeU.exe winmergeu.priority= 1 winmergeu.fixeol=True winmergeu.checkchanged=True winmergeu.args= /e /ub /dl other /dr local $other $local $output winmergeu.gui=False [tortoisehg] vdiff = winmerge Visual diff works