summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/cvs/windows-NT/options.h
diff options
context:
space:
mode:
authorThorsten Lockert <tholo@cvs.openbsd.org>1997-03-18 01:57:34 +0000
committerThorsten Lockert <tholo@cvs.openbsd.org>1997-03-18 01:57:34 +0000
commitdc436b41f730ec3bda6f945e892fce63b155d436 (patch)
tree2ffa304b2b219a153c94f08997d783648e3cca13 /gnu/usr.bin/cvs/windows-NT/options.h
parentf663b2e9d210d80ac48418288ea07bca553919f2 (diff)
New release from Cyclic Software
Diffstat (limited to 'gnu/usr.bin/cvs/windows-NT/options.h')
-rw-r--r--gnu/usr.bin/cvs/windows-NT/options.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/gnu/usr.bin/cvs/windows-NT/options.h b/gnu/usr.bin/cvs/windows-NT/options.h
index b9bba3ffc3a..33103dda051 100644
--- a/gnu/usr.bin/cvs/windows-NT/options.h
+++ b/gnu/usr.bin/cvs/windows-NT/options.h
@@ -55,17 +55,6 @@
#endif
/*
- * The "grep" program to execute when checking to see if a merged file had
- * any conflicts. This "grep" must support the "-s" option and a standard
- * regular expression as an argument. Specify a full pathname if your site
- * wants to use a particular grep.
- */
-
-#ifndef GREP
-#define GREP "grep"
-#endif
-
-/*
* The "patch" program to run when using the CVS server and accepting
* patches across the network. Specify a full pathname if your site
* wants to use a particular patch.