# HG changeset patch
# User Chris Cannam
# Date 1297363787 0
# Node ID cbfc1930289a4d48458d02b2bfbd3585541e1d65
# Parent  24820581e5329467d0a3847f0cddae1fedcc07b6# Parent  b6e4643d6c0506e02f122602b04199c373d042dc
Merge

diff -r b6e4643d6c05 -r cbfc1930289a easyhg-extdiff.sh
--- a/easyhg-extdiff.sh	Wed Feb 09 12:02:53 2011 +0000
+++ b/easyhg-extdiff.sh	Thu Feb 10 18:49:47 2011 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 p=`dirname $0`
 if [ $# -lt 2 ]; then 
     echo Insufficient arguments: $@
@@ -13,11 +13,18 @@
 	found=true
 	"$p/$d" "$1" "$2"
 	break
+    elif [ -x "$(type -path $d)" ]; then
+	found=true
+	"$d" "$1" "$2"
+	break;
     fi
 done
 if [ -z "$found" ]; then
     od=/usr/bin/opendiff
     if [ -x "$od" ]; then
+	found=true
 	"$od" "$1" "$2" | cat
     fi
 fi
+[ -z "$found" ]
+
diff -r b6e4643d6c05 -r cbfc1930289a easyhg-merge.sh
--- a/easyhg-merge.sh	Wed Feb 09 12:02:53 2011 +0000
+++ b/easyhg-merge.sh	Thu Feb 10 18:49:47 2011 +0000
@@ -18,6 +18,10 @@
 	found=true
 	"$p/$d" "$ancestor" "$left" "$right" -o "$out"
 	break
+    elif [ -x "$(type -path $d)" ]; then
+	found=true
+	"$d" "$ancestor" "$left" "$right" -o "$out"
+	break;
     fi
 done
 if [ -z "$found" ]; then
@@ -26,3 +30,4 @@
 	"$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right"
     fi
 fi
+[ -z "$found" ]