Permalink
Switch branches/tags
Nothing to show
Find file
Fetching contributors…
Cannot retrieve contributors at this time
executable file 13 lines (11 sloc) 337 Bytes
#!/bin/sh
# Script to be used with git mergetool to handle opendiff nicely.
if [ $# != 6 ]
then
echo "ERROR: Don't call this script directly; use 'git mergetool' instead."
exit
fi
# Kill all instances of FileMerge already running
pkill FileMerge
# Pipe output from opendiff to make it wait for FileMerge to exit
opendiff "$@" | cat