Last active
August 29, 2015 13:57
-
-
Save cad-san/9727139 to your computer and use it in GitHub Desktop.
git diff tool that use winmerge
This file contains 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
| [difftool "DiffScript"] | |
| path = ~/bin/difftool.sh | |
| cmd = "~/bin/difftool.sh \"$LOCAL\" \"$REMOTE\"" |
This file contains 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 | |
| echo Viewing: \"$2\" | |
| if [ -e $1 -a -e $2 ] | |
| then | |
| "path/to/WinMergeU.exe" -e -r -u -wl -dl "Base" -dr "Mine" "$(cygpath -aw "$1")" "$(cygpath -aw "$2")" | |
| else | |
| echo "skipping as one file doesn't exist" | |
| fi |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment