diff --git a/bash/meld.sh b/bash/meld.sh index cf06a5a8..e5699fcb 100755 --- a/bash/meld.sh +++ b/bash/meld.sh @@ -2,8 +2,8 @@ set -e -GitDir=~/NetBeansProjects -#GitDir="/c/Users/sgold/My Documents/NetBeansProjects" +#GitDir=~/NetBeansProjects +GitDir="/c/Users/sgold/My Documents/NetBeansProjects" S1="$GitDir/LbjExamples/apps/src/main/java/com/github/stephengold/lbjexamples/apps" D1="$GitDir/Minie/TutorialApps/src/main/java/jme3utilities/tutorial" @@ -26,7 +26,7 @@ D6="$GitDir/V-Sport/apps/src/main/java/com/github/stephengold/vsport/tutorial" S7="$GitDir/LbjExamples/apps/src/main/java" D7="$GitDir/Minie/MinieExamples/src/main/java" -Meld="/usr/bin/meld" -#Meld="/c/Program Files/Meld/meld" +#Meld="/usr/bin/meld" +Meld="/c/Program Files/Meld/meld" "$Meld" --diff "$S1" "$D1" --diff "$S2" "$D2" --diff "$S3" "$D3" --diff "$S4" "$D4" --diff "$S5" "$D5" --diff "$S6" "$D6" --diff "$S7" "$D7"