Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Branch: master
Fetching contributors…

Cannot retrieve contributors at this time

executable file 13 lines (11 sloc) 0.387 kB
#!/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
ps x | grep FileMerge | grep -v grep | cut -d' ' -f1 | xargs kill
# Pipe output from opendiff to make it wait for FileMerge to exit
opendiff "$@" | cat
Jump to Line
Something went wrong with that request. Please try again.