diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-03-14 15:59:07 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-03-14 15:59:07 +0000 |
| commit | 87658690ec71fec07a9118602b0509e4269659a6 (patch) | |
| tree | 057b194029659fb51c69dfdd93e075419ddb4978 /usr.bin/rcs | |
| parent | 6394563ad4360b338a8cf3f3156e0f2d089d571f (diff) | |
add an argument to cvs_diff3() to be able to handle verbosity of
commands; fixes rcsmerge -q behaviour. OK niallo@ ray@.
Diffstat (limited to 'usr.bin/rcs')
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c index 58b1e6e1211..31a53805553 100644 --- a/usr.bin/rcs/rcsmerge.c +++ b/usr.bin/rcs/rcsmerge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsmerge.c,v 1.19 2006/03/08 12:34:53 xsa Exp $ */ +/* $OpenBSD: rcsmerge.c,v 1.20 2006/03/14 15:59:06 xsa Exp $ */ /* * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. @@ -133,7 +133,8 @@ rcsmerge_main(int argc, char **argv) "%s into %s%s\n", r1, r2, argv[i], (pipeout == 1) ? "; result to stdout":""); - if ((bp = cvs_diff3(file, argv[i], baserev, frev)) == NULL) { + if ((bp = cvs_diff3(file, argv[i], baserev, + frev, verbose)) == NULL) { cvs_log(LP_ERR, "failed to merge"); rcs_close(file); continue; |