# HG changeset patch
# User mpm@selenic.com
# Date 1118424998 28800
# Node ID f06a4a3b86a794c67508341dd6b92d3ff70f702e
# Parent  719812eb0156ade1b4004f5a905fcc9e599034df# Parent  38fb7d23b78d69e8fa536f74bc16aa034d828a0a
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-----


diff -r 719812eb0156 -r f06a4a3b86a7 hgmerge
--- 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
 
diff -r 719812eb0156 -r f06a4a3b86a7 mercurial/commands.py
diff -r 719812eb0156 -r f06a4a3b86a7 mercurial/hg.py
diff -r 719812eb0156 -r f06a4a3b86a7 mercurial/revlog.py