diff options
| author |   xsa <xsa@openbsd.org> | 2005-10-26 18:13:58 +0000 |
|---|---|---|
| committer | xsa <xsa@openbsd.org> | 2005-10-26 18:13:58 +0000 |
| commit | 417145775a6b1fbc1084386f64475af4dded2345 (patch) | |
| tree | 72e3db4d7c89ce3128464bf15f524ba54b81baad /usr.bin/cvs/diff3.c | |
| parent | add an i2s framework, which can be reused in new audio drivers (diff) | |
| download | wireguard-openbsd-417145775a6b1fbc1084386f64475af4dded2345.tar.xz wireguard-openbsd-417145775a6b1fbc1084386f64475af4dded2345.zip | |
diff3_conflicts cleanup; joris ok
Diffstat (limited to 'usr.bin/cvs/diff3.c')
| -rw-r--r-- | usr.bin/cvs/diff3.c | 6 |
1 files changed, 3 insertions, 3 deletions
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) |