![[BACK]](/icons/back.gif){kind=icon}
Return to rcsmerge.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs|
Return to rcsmerge.c CVS log | Up to [local] / src / usr.bin / rcs |
| version 1.19, 2006/03/08 12:34:53 | version 1.20, 2006/03/14 15:59:06 | ||
|---|---|---|---|
|
|
||
| "%s into %s%s\n", r1, r2, argv[i], | "%s into %s%s\n", r1, r2, argv[i], | ||
| (pipeout == 1) ? "; result to stdout":""); | (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"); | cvs_log(LP_ERR, "failed to merge"); | ||
| rcs_close(file); | rcs_close(file); | ||
| continue; | continue; |