# ------------------------------------------------ # Human writable properties for diff ant script : # ------------------------------------------------ # Left folder to compare [MASTER] : dir.left =../simdb-browser # right folder to compare : dir.right =./webapp/simdb-browser # ------------------------------------------------ ## Change DIFFMERGE_PATH to point to where you installed DiffMerge DIFFMERGE_PATH=/Applications/DiffMerge.app ## The actual executable is hidden inside the .app bundle. DIFFMERGE_EXE=${DIFFMERGE_PATH}/Contents/MacOS/DiffMerge ## Launch DiffMerge using the given command line arguments. Use --help for ## additional information or see the man page distributed along with this ## shell script. # ------------------------------------------------ # merge command : merge.cmd =${DIFFMERGE_EXE} ## MacOS FileMerge standard application : # merge.cmd =/usr/bin/opendiff # ------------------------------------------------ # open file browser command : open.cmd =open # --------------------------------------------------