aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-12-13 00:01:41 +0100
committerJunio C Hamano <junkio@cox.net>2006-12-12 21:47:29 -0800
commite2b7008752d85874919ea718d098fec01b4a9019 (patch)
tree4175a000078a2fbff6da0291faa16ea592c1281c /t
parentfbe0b24ca53111208b8ecd920cc112d0be13f93c (diff)
downloadgit-e2b7008752d85874919ea718d098fec01b4a9019.tar.gz
git-e2b7008752d85874919ea718d098fec01b4a9019.tar.xz
Get rid of the dependency on RCS' merge program
Now that we have git-merge-file, an RCS merge lookalike, we no longer need it. So long, merge, and thanks for all the fish! Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
-rwxr-xr-xt/t0000-basic.sh14
1 files changed, 1 insertions, 13 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 81f3bedc9..3260d1d7a 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -19,11 +19,7 @@ modification *should* take notice and update the test vectors here.
'
################################################################
-# It appears that people are getting bitten by not installing
-# 'merge' (usually part of RCS package in binary distributions).
-# Check this and error out before running any tests. Also catch
-# the bogosity of trying to run tests without building while we
-# are at it.
+# It appears that people try to run tests without building...
../git >/dev/null
if test $? != 1
@@ -32,14 +28,6 @@ then
exit 1
fi
-merge >/dev/null 2>/dev/null
-if test $? = 127
-then
- echo >&2 'You do not seem to have "merge" installed.
-Please check INSTALL document.'
- exit 1
-fi
-
. ./test-lib.sh
################################################################