Mercurial > hg > easyhg
changeset 279:cbfc1930289a
Merge
| author | Chris Cannam |
|---|---|
| date | Thu, 10 Feb 2011 18:49:47 +0000 |
| parents | 24820581e532 (diff) b6e4643d6c05 (current diff) |
| children | a98e76fa58f2 |
| files | hgexplorer.ico hgexplorer.png |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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" ] +
--- 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" ]