Mercurial > hg > easyhg
diff easyhg-merge.sh @ 282:1ec306df738e
Merge
author | Chris Cannam |
---|---|
date | Fri, 18 Feb 2011 13:39:16 +0000 |
parents | 24820581e532 |
children | a1c8630a0057 |
line wrap: on
line diff
--- 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" ]