Skip to content

Instantly share code, notes, and snippets.

@kaskavalci

kaskavalci/mergetool.sh

Created September 26, 2015 10:37
Show Gist options
  • Save kaskavalci/65aff8a2aae6d4dd664b to your computer and use it in GitHub Desktop.
Save kaskavalci/65aff8a2aae6d4dd664b to your computer and use it in GitHub Desktop.
Download ZIP
Raw
mergetool.sh
source common.sh
if is_myfile $1 $2 ; then
#DiffMerge.exe -base BASE FILE1 FILE2 -out OUTPUT -xmerge
"$RHAPSODY_PATH" -base $3 $1 $2 -out $4 -xmerge
else
#kdiff3 BASE FILE1 FILE2 -o OUTPUT
"$KDIFF3_PATH" $3 $1 $2 -o $4
fi
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment