Mercurial > hg > easyhg
view easyhg-merge.sh @ 288:ca6edd303c9d
Add "Summarise changes" options to changeset item right-button menu (already existed for uncommitted item)
author | Chris Cannam |
---|---|
date | Mon, 21 Feb 2011 11:37:58 +0000 |
parents | 24820581e532 |
children | a1c8630a0057 |
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" found="" for d in kdiff3 kdiff3.exe; do if [ -x "$p/$d" ]; then 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 "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" fi fi [ -z "$found" ]