How to use Winmerge with Git Extensions?

Posted by sebastiaan on Stack Overflow See other posts from Stack Overflow or by sebastiaan
Published on 2010-03-18T07:54:18Z Indexed on 2010/03/18 8:01 UTC
Read the original article Hit count: 1096

Filed under:

git

|

git-extensions

|

winmerge

|

settings

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 syntax I should use and why. There seem to be 4 variables: $BASE, $LOCAL, $REMOTE, $MERGED. It seems that I should pass these to WinMergeU.exe, but with which command line parameters?

I've tried to search for this a few times, but there is no answer that actually seems to work.

© Stack Overflow or respective owner

Related posts about git

git pull gives error: 401 Authorization Required while accessing https://git.foo.com/bar.git

as seen on Stack Overflow - Search for 'Stack Overflow'
My macbook pro is able to clone/push/pull from the company git server. My cent 6.3 vm gets a 401 error git clone https://git.acme.com/git/torque-setup "error: The requested URL returned error: 401 Authorization Required while accessing https://git.acme.com/git/torque-setup/info/refs As a work… >>> More
Can't install git on Ubuntu 12.10

as seen on Ask Ubuntu - Search for 'Ask Ubuntu'
I'm following these instructions to install git on my laptop: http://git-scm.com/download/linux When I do: $ sudo apt-get install git-core This is what my terinal shows: Reading package lists... Done Building dependency tree Reading state information... Done The following packages… >>> More
Git apache : unable to push via http

as seen on Server Fault - Search for 'Server Fault'
I have to setup a server which can allow http vcs management (such as git and svn). svn support works well, but I have some trouble with git. Actual configuration: CentOS 5 Apache 2.2.8 Git 1.7.4.1 The /etc/httpd/conf/httpd.conf content: ServerTokens OS ServerRoot "/etc/httpd" PidFile run/httpd… >>> More
git on HTTP with gitolite and nginx

as seen on Server Fault - Search for 'Server Fault'
I am trying to setup a server where my git repo would be accessible with HTTP(S). I am using gitolite and nginx (and gitlab for web interface but I doubt it makes any difference). I have searched the whole afternoon and I think I'm stuck. I have think I have understood that nginx needs fcgiwrap… >>> More
Redmine git integration - issue in accessing git from redmine but not from external git client

as seen on Server Fault - Search for 'Server Fault'
I have setup redmine integration with apache as described in the redmine documentation. I have a /git path accessible with auth and /git-private accessible only to redmine. When I clone the repository through /git path, I get the up-to-date repo. But when I try to view it in redmine repo viewer, I… >>> More

Related posts about git-extensions

Clear list of recent repositories in Git Extensions

as seen on Geeks with Blogs - Search for 'Geeks with Blogs'
Orphaned and wrong specified repositories in the recent list are annoying. Straightaway I does not found an option to clean this entries. And also not the persistence place for that. So it was time for Process Explorer. The storage happens under: HKEY_CURRENT_USER\Software\GitExtensions\GitExtensions\1… >>> 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
Git Extensions guide?

as seen on Stack Overflow - Search for 'Stack Overflow'
Is there a quick-start guide to using Git Extensions for basic tasks such as checkout, checkin, undo-checkout, etc, especially for users coming from the Microsoft world? >>> More
GitExtension does not show up on Visual Studio 2010 Express (Windows 7)

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi, I am using Visual Studio 2010 Express on Windows 7. I recently installed GitExtension and it seems to work fine (cloning and branching and what not). I expected it to show up on Visual Studio Express when I opened VS, but it does not. I have searched online and found a few references to the… >>> More
Using Git with VB6

as seen on Stack Overflow - Search for 'Stack Overflow'
Our company has a large codebase in VB6, and we currently use VSS which, for all that we hate about it, at least integrates into the VB6 IDE. My own team, which is using .NET, are now looking into alternative SCMs like my personal favourite, Git. With Git Extensions, it seems we will be able to integrate… >>> More