Created
March 4, 2010 14:02
-
-
Save lauriro/321720 to your computer and use it in GitHub Desktop.
diffmerge-merge.sh
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 | |
| localPath="$(cygpath --mixed --absolute "$2")" | |
| basePath="$(cygpath --mixed --absolute "$1")" | |
| remotePath="$(cygpath --mixed --absolute "$3")" | |
| resultPath="$(cygpath --mixed --absolute "$4")" | |
| if [ ! -f $basePath ] | |
| then | |
| basePath="$(cygpath --mixed --absolute ~/diffmerge-empty)" | |
| fi | |
| #echo -ne "local\n$localPath\n" | |
| #echo -ne "base\n$basePath\n" | |
| #echo -ne "remote\n$remotePath\n" | |
| #echo -ne "result\n$resultPath\n" | |
| "/cygdrive/c/Program Files/SourceGear/DiffMerge/DiffMerge.exe" --merge --result="$resultPath" "$localPath" "$basePath" "$remotePath" --title1="Mine" --title2="Merged: $4" --title3="Theirs" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment