Created
September 16, 2011 01:23
-
-
Save rogerz/1220950 to your computer and use it in GitHub Desktop.
winmerge script for msysGit
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
# git config --global -e | |
# | |
# [diff] | |
# tool = winmerge | |
# [difftool "winmerge"] | |
# cmd = winmerge.sh $LOCAL $REMOTE $BASE | |
# [difftool] | |
# prompt = false | |
NULL="/dev/null" | |
if [ "$2" = "$NULL" ] ; then | |
echo "removed: $3" | |
elif [ "$1" = "$NULL" ] ; then | |
echo "added: $3" | |
else | |
echo "changed: $3" | |
"D:/Program Files/WinMerge/WinMergeU.exe" -e -ub -dl "Base:$1" -dr "Mine:$2" "$1" "$2" | |
fi |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment