![]() Now whenever we type git diff we will get the standard, textual git difference listing. ![]() This syntax is more in line with the way the we configured the git mergetool last time. I’ve left the external tool commented out (prefixed by #). Ĭmd = git-diff-diffmerge-wrapper.sh "$LOCAL" "$REMOTE" gitconfig to disable the previously added external tool setup for git diff, and configure git difftool in its place. "C:/Program Files (x86)/SourceGear/DiffMerge/DiffMerge.exe" "$1" "$2" | cat I called this git-diff-diffmerge-wrapper.sh and put it in my Git/cmd directory (which is also on my PATH). Configuration tweaksįirst alteration to the previous approach was to create a difftool wrapper for Diffmerge. The workaround is essential just a tweak of the steps we used previously to get git diff working, so its probably easiest to have a quick skim through that before going through this. ![]() What I did have time for was to find a workaround using git difftool, which is a new command added to Git as of version 1.6.3. Unfortunately in the time I had to look at it I couldn’t figure out if this was due to a new version of PowerShell with Windows 7, the new version of MSys Git I had installed, or something strange after switching to 圆4 architecture. In fact, any external tool I tried to define would hang PowerShell once it exited. – DT, Īfter installing Windows 7 I had trouble getting git diff to work properly with diffmerge. If you want flexibility in which tools you use and how they’re used, then read on. If you don’t mind using KDiff3 then you might want to check that out first. UPDATE!!! I’m now using an easier way of configuring diff and merge tools.
0 Comments
Leave a Reply. |