Mercurial > hg > easyhg
view easyhg-extdiff.sh @ 532:06507a59f2b8 easyhg_v1.1
This will do for the Merge topic
author | Chris Cannam |
---|---|
date | Wed, 23 Nov 2011 17:24:47 +0000 |
parents | d63711ff6740 |
children |
line wrap: on
line source
#!/bin/bash -x p=`dirname $0` if [ $# -lt 2 ]; then echo Insufficient arguments: $@ exit 2 fi while [ $# -gt 2 ]; do shift done for d in easyhg-kdiff3 easyhg-kdiff3.exe kdiff3 kdiff3.exe; do if [ -x "$p/$d" ]; then exec "$p/$d" "$1" "$2" elif [ -x "$(type -path $d)" ]; then exec "$d" "$1" "$2" fi done od=/usr/bin/opendiff if [ -x "$od" ]; then "$od" "$1" "$2" | cat exit 0 fi exit 1