Mercurial > hg > easyhg
diff easyhg-merge.sh @ 307:5b4aa1c24407 new-branches-with-status-outside-tabs
Merge branch status_outside_tabs into branch new-branches, and make a new branch
author | Chris Cannam |
---|---|
date | Mon, 28 Feb 2011 13:09:37 +0000 |
parents | a1c8630a0057 |
children | ea62eb083ed4 |
line wrap: on
line diff
--- a/easyhg-merge.sh Wed Feb 09 12:03:15 2011 +0000 +++ b/easyhg-merge.sh Mon Feb 28 13:09:37 2011 +0000 @@ -18,11 +18,17 @@ 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 fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge if [ -x "$fm" ]; then + found=true "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" fi fi +[ -n "$found" ]