diff options
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-13 02:01:41 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 08:47:29 +0300 |
commit | e2b7008752d85874919ea718d098fec01b4a9019 (patch) | |
tree | 4175a000078a2fbff6da0291faa16ea592c1281c /t | |
parent | fbe0b24ca53111208b8ecd920cc112d0be13f93c (diff) |
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-x | t/t0000-basic.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index 81f3bedc90..3260d1d7a7 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 ################################################################ |