diffmerge script

diffmerge

#!/bin/sh
## A little script to make it easier to launch DiffMerge from the command line.
## Install this script into a folder in your path, such as /usr/bin or /usr/local/bin.
##
## Version 3.3.0.1001
## Copyright (C) 2003-2009 SourceGear LLC. All Rights Reserved.
##############################################################################

## Change DIFFMERGE_PATH to point to where you installed DiffMerge

DIFFMERGE_PATH=/Applications/Utilities/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.

exec ${DIFFMERGE_EXE} --nosplash "$@"

## Instructions

# 1. Download and add Diffmerge to Applications/Utilities
# 2. Add this script under ~/bin/diffmerge
# 3. Add the below to ~/.gitconfig

# [diff]
#         tool = diffmerge
# [difftool "diffmerge"]
#         cmd = diffmerge \"$LOCAL\" \"$REMOTE\"
# [merge]
#         tool = diffmerge
# [mergetool "diffmerge"]
#         cmd = diffmerge --merge --result=\"$MERGED\"\n  \"$LOCAL\" \"$BASE\" \"$REMOTE\"
#         trustexitcode = false