diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2008-02-23 23:42:24 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2008-02-23 23:42:24 +0000 |
| commit | ab02a548e27c325d0364332d86de6ba7afd20f6c (patch) | |
| tree | b0bfd20118f26aed33ac22e3e4ad61efd1ef9211 | |
| parent | df2d40ebe4d8b073dd931571ce689dce2dde0e96 (diff) | |
reset overlapcnt at each cvs_merge_file() call so that files that
are being merged that have no conflicts will not report the previous
conflicts that might have been found.
| -rw-r--r-- | usr.bin/cvs/diff3.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index fa6a440fc45..4bcfb654689 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.40 2008/02/11 20:33:11 tobias Exp $ */ +/* $OpenBSD: diff3.c,v 1.41 2008/02/23 23:42:23 joris 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.40 2008/02/11 20:33:11 tobias Exp $"; + "$OpenBSD: diff3.c,v 1.41 2008/02/23 23:42:23 joris Exp $"; #endif /* not lint */ #include <ctype.h> @@ -172,6 +172,7 @@ cvs_merge_file(struct cvs_file *cf, int verbose) struct cvs_line *lp; struct cvs_lines *dlines, *plines; + overlapcnt = 0; b1 = b2 = b3 = d1 = d2 = diffb = NULL; rcsnum_tostr(cf->file_ent->ce_rev, r1, sizeof(r1)); rcsnum_tostr(cf->file_rcsrev, r2, sizeof(r2)); |