You no longer have to mess with the .ini file. As long as you have both TortoiseHG and WinMerge installed you will see it as an option in TortoiseHG Global Settings – TortoiseHG section – Three-way Merge Tool and Visual Diff Tool. It shows up as “winmergeu”. Banged my head against the wall for a … Read more
You must be getting something wrong, or have environmental problems with your machine. Adding a user PATH environment variable does result in it being merged into the environment of a new process. Update: Perhaps this comment from the MSDN topic on environment variables might be pertinent: Found out that on Windows Server 2003, once the … Read more
Menu > View > View Line Numbers I’m using version 2.14.0.0
Overview The following is instructions on how to setup GIT Version Control so that you can use a better set of tools than the default installation. The setup requires that GIT Extensions is already installed and involves configuring Winmerge in GIT extensions. Installation Walk through all the prompts and install in the default directory for … Read more
You are talking about merge tool, yet you (and some other people with answers) are configuring it as a diff tool. To configure a merge tool, you’d need to use merge.tool and mergetool configurations instead of diff.tool and difftool, like this: git config –global merge.tool winmerge git config –replace –global mergetool.winmerge.cmd “\”C:\Program Files (x86)\WinMerge\WinMergeU.exe\” -e … Read more
You can open the TortoiseSVN settings and manually enter it: My command line from the screenshot above is: C:\Program Files (x86)\WinMerge\WinMergeU.exe -e -x -ub -dl %bname -dr %yname %base %mine If you install TortoiseSVN after WinMerge, probably the easiest way would be to uninstall and re-install WinMerge again.
Update June 2015, 6 years later: As detailed in “git mergetool winmerge”, a simple git config diff.tool winmerge will be enough. Git 2.5+ (Q2, 2015) is now aware of Winmerge as a diff or merge tool! Original answer (2009-2012) (msysgit, 1.6.5, DOS session) The first part (using winmerge) is described in “How do I view … Read more
Try making a Filefilter WinMerge handles this just fine. You want to create and use a Filter. Under Tools | Filters… | Filefilters, create a new filter or modify an existing one. It will look like this: ## Ignore Java class and jar files f: \.class$ f: \.jar$ ## Ignore subversion housekeeping directories d: \\.svn$ … Read more