Mercurial > hg > easyhg
view easyhg-extdiff.sh @ 322:913d213dd427
Remove message about updating to bring changes into the working copy: it isn't always true (e.g. if you have to do a merge next)
author | Chris Cannam |
---|---|
date | Wed, 02 Mar 2011 16:29:17 +0000 |
parents | a1c8630a0057 |
children | ea62eb083ed4 |
line wrap: on
line source
#!/bin/bash -x p=`dirname $0` if [ $# -lt 2 ]; then echo Insufficient arguments: $@ exit 2 fi while [ $# -gt 2 ]; do shift done found="" for d in kdiff3 kdiff3.exe; do if [ -x "$p/$d" ]; then 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 [ -n "$found" ]