diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-03-06 08:46:56 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-03-06 08:46:56 +0000 |
| commit | a6b29eb3d5f6efde8045f33f7525945373dd627f (patch) | |
| tree | a68367802cfea15ebc83a08697be01ec7febe3cc /usr.bin/cvs | |
| parent | 4584170e9c4f9658ed8295881f7d068d49e70468 (diff) | |
if the submitted rev(s) is/are the same as the head rev, skip the process
for the specified file. Fix some error messages while there. OK joris@
Diffstat (limited to 'usr.bin/cvs')
| -rw-r--r-- | usr.bin/cvs/diff3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c index b6037d29e38..71e8dfbee75 100644 --- a/usr.bin/cvs/diff3.c +++ b/usr.bin/cvs/diff3.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff3.c,v 1.15 2006/03/05 16:34:31 niallo Exp $ */ +/* $OpenBSD: diff3.c,v 1.16 2006/03/06 08:46:55 xsa 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.15 2006/03/05 16:34:31 niallo Exp $"; + "$OpenBSD: diff3.c,v 1.16 2006/03/06 08:46:55 xsa Exp $"; #endif /* not lint */ #include "includes.h" @@ -241,8 +241,8 @@ cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2) goto out; if (diff3_conflicts != 0) { - cvs_printf("%d conflict%s found during merge, " - "please correct.\n", diff3_conflicts, + cvs_log(LP_WARN, "%d conflict%s found during merge, " + "please correct.", diff3_conflicts, (diff3_conflicts > 1) ? "s" : ""); } |