Mercurial > hg > easyhg
view easyhg-merge.sh @ 371:f051d210521e
Ensure current item is visible in graph after update
author | Chris Cannam |
---|---|
date | Thu, 24 Mar 2011 10:47:03 +0000 |
parents | ea62eb083ed4 |
children | d2e4bf428cfc |
line wrap: on
line source
#!/bin/bash p=`dirname $0` echo Args are: $@ 1>&2 if [ "$#" -lt 3 ]; then echo Insufficient arguments: $@ exit 2 fi while [ "$#" -gt 3 ]; do shift done out="$1" left="$1" ancestor="$2" right="$3" for d in kdiff3 kdiff3.exe; do if [ -x "$p/$d" ]; then exec "$p/$d" "$ancestor" "$left" "$right" -o "$out" elif [ -x "$(type -path $d)" ]; then exec "$d" "$ancestor" "$left" "$right" -o "$out" fi done fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge if [ -x "$fm" ]; then exec "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" fi exit 1