You can also set it up using the commands git config -replace -global if you so wish. Note that I used the old DOS 8.3 format in the path tool = diffm cmd = "H:/PROGRA~1/SourceGear/DiffMerge/DiffMerge.exe $LOCAL $REMOTE" prompt = false tool = diffmerge cmd = "H:/PROGRA~1/SourceGear/DiffMerge/DiffMerge.exe -merge -result=$MERGED $LOCAL $BASE $REMOTE" trustExitCode = false keepBackup = false You'll just need to edit the path to where your version of of DiffMerge is. gitconfig which normally resides in the following directory C:\Documents and Settings\ You'll need to have DiffMerge program installed already. It does not require any scripts only that you edit your. So what I did eventually was to hack together my own simple solution from all the info I got on the internet which works for me.
I could get the merge part to work and not the diff part or vice versa. I tried all of the solutions above and elsewhere. I looked all over the internet for the answer to this. Trying the "external diff" option for a particular file gives the cryptic error message Unknown Option "Ĭlearly, I have no idea what I'm doing anymore so any help would be much appreciated. Pressing on, I launched gitk and under Edit>Preferences, I chose the same wrapper script.
INSTALL DIFFMERGE ON UBUNTU WINDOWS
I get a message File (\dev\null) not found - which given I'm on Windows is not surprising. If i launch Git Bash and execute git diff HEAD HEAD~ - myfile gitconfig file as follows: external = C:/Programs/git/cmd/git-diff-wrapper.bat I placed the bat file under %GIT_INSTALL%/cmd and edited my. Based on this thread on SO, I created the following batch file: off REM - Switch forward slashes to back slashes - set oldW=%2 set oldW=%oldW:/=\% set newW=%5 set newW=%newW:/=\% REM - Launch DiffMerge - "C:/Programs/SourceGear/DiffMerge/DiffMerge.exe" /title1="Old Version" %oldW% /title2="New Version" %newW% I'm trying to put together a wrapper script that I can use to replace the built in git diff with DiffMerge. While installing, I picked option 1 to "Use Git Bash only".I'm using msysgit 1.6.2.2 on Windows XP.I've just started using Git and it's possible I've missed something obvious, but here goes:
0 kommentar(er)
