Skip to content
Snippets Groups Projects
Commit f06a4a3b authored by mpm's avatar mpm
Browse files

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-----
parents 719812eb 38fb7d23
No related branches found
No related tags found
No related merge requests found
......@@ -11,6 +11,8 @@
BASE=$2
OTHER=$3
EDITOR="${EDITOR:-vi}"
# Back up our file
cp $LOCAL $LOCAL.orig
......@@ -29,10 +31,12 @@
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
......@@ -38,3 +42,2 @@
fi
fi
......@@ -40,10 +43,11 @@
# 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment