diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-10-23 04:25:35 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-10-23 04:25:35 +0000 |
| commit | 6b23b52e534e6aa2634dd8edfa20c8c14d43fce7 (patch) | |
| tree | a58a1ccf994cd8a54a45d54bd1ea4dbdcd53e18c /usr.bin | |
| parent | ac29ef06837ef123d1c4624789485f20819b5688 (diff) | |
warn if conflicts were found during the merge;
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c index d1f5e38b072..246cbb45a99 100644 --- a/usr.bin/rcs/rcsmerge.c +++ b/usr.bin/rcs/rcsmerge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsmerge.c,v 1.2 2005/10/23 04:07:06 joris Exp $ */ +/* $OpenBSD: rcsmerge.c,v 1.3 2005/10/23 04:25:34 joris Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. @@ -140,6 +140,11 @@ rcsmerge_main(int argc, char **argv) cvs_buf_free(bp); } + if (diff3_conflicts > 0) { + cvs_log(LP_WARN, "%d conflict%s found during merge", + diff3_conflicts, (diff3_conflicts > 1) ? "s": ""); + } + rcs_close(file); } |