Archive for the ‘Git’ Category

mysysgit winmerge

Saturday, November 20th, 2010

winmerge.sh
#!/bin/sh
echo Launching WinMergeU.exe: $1 $2
“C:/Program Files/WinMerge/WinMergeU.exe” -e -ub -dl “Base” -dr “Mine” “$1″ “$2″

vim ~/.gitconfig
[diff]
tool = winmerge
[difftool "winmerge"]
cmd = winmerge.sh “$LOCAL” “$REMOTE”
[difftool]
prompt = false
~
git difftool r2 views.py

Posted in Git | Comments Off