The details on the arguments are available from the git-mergetool(1) man page. Now remember that C:Program FilesGitcmd is on my PATH, so I can set the command to call git-merge-diffmerge-wrapper.sh without fully qualifying the path. I unashamedly stole this from Alexander Groß's post on getting DiffMerge running on Cygwin-based Git (with slight modifications, any faults are mine :)). Again I ended up using the wrapper approach, creating git-merge-diffmerge-wrapper.sh at C:Program FilesGitcmd to call DiffMerge. I had more trouble getting a merge tool working, largely because putting references to paths like C:/Program Files/. We can now use git diff and it will fire up our diff tool of choice. You'll need to have the following section in there: In your home directory ( C:Users(username) or the corresponding Documents and Settings equivalent) Git will normally have created a. The next step is telling Git about your wrapper. I ended up settling on DiffMerge because it is purdy (unlike KDiff3 – sorry), and also does 3-way merges (unlike WinMerge, which was my previous diff tool of choice).
#Sublime merge mergetool free#
You'll also see I've commented out calls to WinMerge and KDiff3, which are both free as in beer and speech. In this case I've used it to setup a call to Sourcefear's DiffMerge, a nice free (as in beer) diff and merge tool. Provided your diff tool can be called from the command line, you'll be able to set it up to work with Git using this template. The basic format of this is stolen directly from this post on the Msysgit site. To make things easy on me I put the script, git-diff-wrapper.sh in C:Program FilesGitcmd, which is in my Path environment variable. The easiest way I found to do this was to create a shell script wrapper for your diff tool of choice. I had to switch to using git difftool instead.
#Sublime merge mergetool windows 7#
Update : This approach stopped working for me when I upgraded to Windows 7 and Git 1.6.3. Windows: Fix DirectWrite handling of fonts with lineGap > 0.Linux: Color glyphs are now drawn properly on light backgrounds.Mac: Error message dialogs can now be closed with the escape key.Mac: Ensure context menus are shown without scrolling.
#Sublime merge mergetool full#