summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/diff.h
diff options
context:
space:
mode:
authorTobias Stoeckmann <tobias@cvs.openbsd.org>2008-02-03 18:18:45 +0000
committerTobias Stoeckmann <tobias@cvs.openbsd.org>2008-02-03 18:18:45 +0000
commit596d463f3adebfac3f5ca7c83e6e8130fd1e39fb (patch)
tree099b0c9c755c0b7026fc21f42eb177cc08fffdbd /usr.bin/cvs/diff.h
parent6f332ca68f94c1595e84bd2788f6dabd3d9327ad (diff)
Added rdiff support. In order to do this, some output and option fixes
had to be done for diff, too. OK joris@
Diffstat (limited to 'usr.bin/cvs/diff.h')
-rw-r--r--usr.bin/cvs/diff.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h
index 16d272fdef3..24d883e128b 100644
--- a/usr.bin/cvs/diff.h
+++ b/usr.bin/cvs/diff.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.h,v 1.14 2007/01/28 02:04:45 joris Exp $ */
+/* $OpenBSD: diff.h,v 1.15 2008/02/03 18:18:44 tobias Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
* All rights reserved.
@@ -98,6 +98,7 @@ int ed_patch_lines(struct cvs_lines *, struct cvs_lines *);
extern int diff_format;
extern int diff3_conflicts;
+extern int diff_iflag;
extern int diff_pflag;
extern char *diff_file;
extern char diffargs[128];