Skip to content

Commit

Permalink
meld.sh: configure for Linux by default
Browse files Browse the repository at this point in the history
  • Loading branch information
stephengold committed Jul 9, 2024
1 parent db0488a commit 72d363a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions bash/meld.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

set -e

#GitDir=~/NetBeansProjects
GitDir="/c/Users/sgold/My Documents/NetBeansProjects"
GitDir=~/NetBeansProjects
#GitDir="/c/Users/sgold/My Documents/NetBeansProjects"

S2="$GitDir/sport"
D2="$GitDir/V-Sport"
Expand All @@ -17,7 +17,7 @@ D5="$GitDir/V-Sport/apps/src/main/java/com/github/stephengold/vsport/demo"
S6="$GitDir/LbjExamples/apps/src/main/java/com/github/stephengold/lbjexamples/apps"
D6="$GitDir/V-Sport/apps/src/main/java/com/github/stephengold/vsport/tutorial"

#Meld="/usr/bin/meld"
Meld="/c/Program Files/Meld/meld"
Meld="/usr/bin/meld"
#Meld="/c/Program Files/Meld/meld"

"$Meld" --diff "$S2" "$D2" --diff "$S3" "$D3" --diff "$S5" "$D5" --diff "$S6" "$D6"

0 comments on commit 72d363a

Please sign in to comment.