Mercurial > hg
changeset 306:f06a4a3b86a7
Merge with TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with TAH
manifest hash: 9ce3631dbbe2070e6e0b8a72e197790c911896e2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCqc+mywK+sNU5EO8RAshrAJ4rqQXCJqB1rqgDQ5ujwOhFqqRuuQCdEUsK
wpBCgWEm3xr9mxQ6rLLsihU=
=Ozg9
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Fri, 10 Jun 2005 09:36:38 -0800 |
| parents | 719812eb0156 (current diff) 38fb7d23b78d (diff) |
| children | 3863e08d597c |
| files | hgmerge mercurial/commands.py mercurial/hg.py mercurial/revlog.py |
| diffstat | 1 files changed, 17 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/hgmerge Fri Jun 10 09:36:02 2005 -0800 +++ b/hgmerge Fri Jun 10 09:36:38 2005 -0800 @@ -11,6 +11,8 @@ BASE=$2 OTHER=$3 +EDITOR="${EDITOR:-vi}" + # Back up our file cp $LOCAL $LOCAL.orig @@ -29,21 +31,23 @@ cp $LOCAL.orig $LOCAL fi -# try using kdiff3, which is fairly nice -if which kdiff3 > /dev/null ; then - if kdiff3 --auto $BASE $LOCAL $OTHER -o $LOCAL ; then - exit 0 - else - exit 1 +if [ -n "$DISPLAY" ]; then + # try using kdiff3, which is fairly nice + if which kdiff3 > /dev/null ; then + if kdiff3 --auto $BASE $LOCAL $OTHER -o $LOCAL ; then + exit 0 + else + exit 1 + fi fi -fi -# try using tkdiff, which is a bit less sophisticated -if which tkdiff > /dev/null ; then - if tkdiff $LOCAL $OTHER -a $BASE -o $LOCAL ; then - exit 0 - else - exit 1 + # try using tkdiff, which is a bit less sophisticated + if which tkdiff > /dev/null ; then + if tkdiff $LOCAL $OTHER -a $BASE -o $LOCAL ; then + exit 0 + else + exit 1 + fi fi fi