# HG changeset patch
# User Chris Cannam
# Date 1298036356 0
# Node ID 1ec306df738e767cffe386d82565463540fda551
# Parent  9162f14c5ab7f5580abc24d8a5ac220662451789# Parent  a98e76fa58f2f9142b0d38206da24b44e57add60
Merge

diff -r 9162f14c5ab7 -r 1ec306df738e easyhg-extdiff.sh
--- a/easyhg-extdiff.sh	Fri Feb 18 13:38:31 2011 +0000
+++ b/easyhg-extdiff.sh	Fri Feb 18 13:39:16 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 9162f14c5ab7 -r 1ec306df738e easyhg-merge.sh
--- a/easyhg-merge.sh	Fri Feb 18 13:38:31 2011 +0000
+++ b/easyhg-merge.sh	Fri Feb 18 13:39:16 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" ]
diff -r 9162f14c5ab7 -r 1ec306df738e mainwindow.cpp
--- a/mainwindow.cpp	Fri Feb 18 13:38:31 2011 +0000
+++ b/mainwindow.cpp	Fri Feb 18 13:39:16 2011 +0000
@@ -1695,7 +1695,7 @@
     case ACT_INCOMING:
         // returns non-zero code and no output if the check was
         // successful but there are no changes pending
-        if (output.trimmed() == "") {
+        if (output.replace(QRegExp("(^|\\n)warning: [^\\n]*\\n"), "").trimmed() == "") {
             showIncoming("");
             return;
         }