diff options
author | 2005-10-22 17:34:47 +0000 | |
---|---|---|
committer | 2005-10-22 17:34:47 +0000 | |
commit | 6f5cacef70d288c27e02c4890dd5046a95503979 (patch) | |
tree | ada269fff366b121c23d10e84a89c5ad6829926e | |
parent | diff3 support, needed for merging files together; (diff) | |
download | wireguard-openbsd-6f5cacef70d288c27e02c4890dd5046a95503979.tar.xz wireguard-openbsd-6f5cacef70d288c27e02c4890dd5046a95503979.zip |
forgot this in previous commit;
-rw-r--r-- | usr.bin/cvs/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/Makefile b/usr.bin/cvs/Makefile index dcfef075d9c..de71a507b8b 100644 --- a/usr.bin/cvs/Makefile +++ b/usr.bin/cvs/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.14 2005/10/06 16:36:09 mickey Exp $ +# $OpenBSD: Makefile,v 1.15 2005/10/22 17:34:47 joris Exp $ PROG= cvs MAN= cvs.1 cvsignore.5 cvsrc.5 cvswrappers.5 cvsintro.7 CPPFLAGS+=-I${.CURDIR} SRCS= cvs.c add.c admin.c annotate.c buf.c checkout.c cmd.c commit.c date.y \ - diff.c edit.c entries.c file.c getlog.c history.c hist.c \ + diff.c diff3.c edit.c entries.c file.c getlog.c history.c hist.c \ import.c init.c log.c logmsg.c proto.c rcs.c rcsnum.c release.c \ remove.c req.c resp.c root.c server.c status.c strtab.c tag.c \ update.c util.c version.c watch.c |