diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2007-12-23 01:15:13 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2007-12-23 01:15:13 +0000 |
| commit | 8602dbb5d540b780ded7baca4f0f52226105a1b2 (patch) | |
| tree | 04c8770f36b3f4075786ef3e912a421fc9e96ca4 /usr.bin/rcs | |
| parent | 7902d8097e493b3aaed9d07b38b6c1e4c254523b (diff) | |
increase the marker buffers, they are not big enough for hg merge
Diffstat (limited to 'usr.bin/rcs')
| -rw-r--r-- | usr.bin/rcs/diff3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/rcs/diff3.c b/usr.bin/rcs/diff3.c index d18231cab12..0672094cd2f 100644 --- a/usr.bin/rcs/diff3.c +++ b/usr.bin/rcs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.24 2007/09/10 14:29:53 tobias Exp $ */ +/* $OpenBSD: diff3.c,v 1.25 2007/12/23 01:15:12 tedu Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -72,7 +72,7 @@ static const char copyright[] = #ifndef lint static const char rcsid[] = - "$OpenBSD: diff3.c,v 1.24 2007/09/10 14:29:53 tobias Exp $"; + "$OpenBSD: diff3.c,v 1.25 2007/12/23 01:15:12 tedu Exp $"; #endif /* not lint */ #include <ctype.h> @@ -137,7 +137,7 @@ static int last[4]; static int eflag = 3; /* default -E for compatibility with former RCS */ static int oflag = 1; /* default -E for compatibility with former RCS */ static int debug = 0; -static char f1mark[40], f3mark[40]; /* markers for -E and -X */ +static char f1mark[256], f3mark[256]; /* markers for -E and -X */ static int duplicate(struct range *, struct range *); static int edit(struct diff *, int, int); |