summaryrefslogtreecommitdiff
path: root/usr.bin/cvs/diff.c
diff options
context:
space:
mode:
authorNiall O'Higgins <niallo@cvs.openbsd.org>2005-12-01 20:36:31 +0000
committerNiall O'Higgins <niallo@cvs.openbsd.org>2005-12-01 20:36:31 +0000
commit10efd1979ee462cd72e8dd7fef990d0f0910998d (patch)
tree08594108eec2a98d152a1a045ae0f6a53e9d325a /usr.bin/cvs/diff.c
parent0b9c4c9c7b1998b920f15db131ef82e835f8f873 (diff)
- fix unified and context diff output, finally!
this was a long standing bug, and the fix is hilarious. ok joris@
Diffstat (limited to 'usr.bin/cvs/diff.c')
-rw-r--r--usr.bin/cvs/diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index e5c31d4f2d4..428855061de 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.67 2005/11/24 11:23:13 xsa Exp $ */
+/* $OpenBSD: diff.c,v 1.68 2005/12/01 20:36:30 niallo Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
* All rights reserved.
@@ -217,7 +217,7 @@ static char *preadline(int, size_t, off_t);
static int Nflag;
#endif
static int aflag, bflag, dflag, iflag, pflag, tflag, Tflag, wflag;
-static int context;
+static int context = 3;
int diff_format = D_NORMAL;
char *diff_file = NULL;
char diffargs[128];