diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cvs/diff.h | 3 | ||||
| -rw-r--r-- | usr.bin/cvs/diff3.c | 6 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h index 52fa3775100..67d52f71d79 100644 --- a/usr.bin/cvs/diff.h +++ b/usr.bin/cvs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.5 2005/10/22 19:05:25 joris Exp $ */ +/* $OpenBSD: diff.h,v 1.6 2005/10/26 18:13:58 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -103,6 +103,7 @@ int cvs_diffreg(const char *, const char *, BUF *out); int ed_patch_lines(struct cvs_lines *, struct cvs_lines *); extern int diff_format; +extern int diff3_conflicts; extern char *diff_file; extern BUF *diffbuf; diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index 4bf0ff3f284..ad2bb88c8e3 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.4 2005/10/23 04:24:59 joris Exp $ */ +/* $OpenBSD: diff3.c,v 1.5 2005/10/26 18:13:58 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -71,7 +71,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: diff3.c,v 1.4 2005/10/23 04:24:59 joris Exp $"; +static const char rcsid[] = "$OpenBSD: diff3.c,v 1.5 2005/10/26 18:13:58 xsa Exp $"; #endif /* not lint */ #include <sys/queue.h> @@ -158,7 +158,7 @@ static void separate(const char *); static void increase(void); static int diff3_internal(int, char **, const char *, const char *); -int diff3_conflicts = 0; +int diff3_conflicts = 0; BUF * cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2) diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c index fbd46429db7..7cc22876173 100644 --- a/usr.bin/rcs/rcsmerge.c +++ b/usr.bin/rcs/rcsmerge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsmerge.c,v 1.5 2005/10/23 11:42:43 niallo Exp $ */ +/* $OpenBSD: rcsmerge.c,v 1.6 2005/10/26 18:13:58 xsa Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. @@ -37,8 +37,6 @@ #include "diff.h" #include "rcsprog.h" -extern diff3_conflicts; - static int kflag = RCS_KWEXP_ERR; int |