view easyhg-merge.sh @ 378:ad2e56d1e4c4

Reset merge-commit comment when merge fails; add missing ampersand from Help menu label

#!/bin/bash
p=`dirname $0`
echo Args are: $@ 1>&2
if [ "$#" -lt 3 ]; then
	echo Insufficient arguments: $@
	exit 2
fi
while [ "$#" -gt 3 ]; do
	shift
done
out="$1"
left="$1"
ancestor="$2"
right="$3"
for d in kdiff3 kdiff3.exe; do
    if [ -x "$p/$d" ]; then
	exec "$p/$d" "$ancestor" "$left" "$right" -o "$out"
    elif [ -x "$(type -path $d)" ]; then
	exec "$d" "$ancestor" "$left" "$right" -o "$out"
    fi
done
fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
if [ -x "$fm" ]; then
    exec "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right"
fi
exit 1