Path = C:\\Program Files\\SourceGear\\Common\\DiffMerge\\sgdm.exe I added this to my PATH: C:\Program Files\SourceGear\Common\DiffMerge ģ) To make diffmerge the default add the following to your global. This is in the same place as the HOME variable. The HOME variable can be set by navigating to environment variables within windows (for 7, right click on Computer->Properties->Advanced system settings->Environment Variables).Ģ) Make sure diffmerge is in your PATH variable on your machine. Or just navigate to the file in a windows explorer and edit it that way. gitconfig stored at ~/.gitconfig, which is relative to your HOME path. I finally got diffmerge to work on Windows 7,8,10 using Git 2.6.3, 2.7.0ġ) Make sure you can write to and use your global. "C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe" "$1" "$2" | cat You may want to change your git-diff-diffmerge-wrapper.sh to something along these lines, to handle properly removed / added files, as it was suggested in an answer to another question. gitconfig and add the copied path to it (you have to add an extra slash at the end of the copied path).Īfter that steps, you should be able to launch your merge tool. Using mouse select the path (in my case it's /C/Users/lpiepiora/cmds and hit Enter.ģ) Now edit your. Right-click on the window title and select Mark. How to do that?ġ) Go to the place, where you have the wrapper, and run Git Bash there.Ģ) In the Git Bash window type pwd, which will show you current working directory. You have to give it using the cygwin format. I understand you don't want to mess with the git installation, so I suggest that you give the complete path to your wrapper. I checked that by running env | grep PATH from within git bash. It seems to me that the problem is that the path that git bash is using is not the one that Windows is using. Here are all of my difftool settings if you want to make the switch: Ĭmd = "\"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\""Ĭmd = "\"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"" I actually do most of my diffing on Windows nowadays with Beyond Compare 3 Pro, though sometimes I will still use DiffMerge. I'm currently using Git 2.0, but I seem to recall having set this up with either Git 1.8.x or maybe even as early as Git 1.7.x, so try it out and see if it works. Note that I'm using msysgit Bash (not sure if it will be different for Cygwin or PoshGit users): Ĭmd = C:/Program\\ Files/SourceGear/Common/DiffMerge/sgdm.exe \"$LOCAL\" \"$REMOTE\" Not sure if this well help, but this is my configuration for difftool with DiffMerge.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |