![[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.7, 2005/11/02 11:26:19 | version 1.8, 2005/11/02 13:21:37 | ||
|---|---|---|---|
|
|
||
| else | else | ||
| frev = rev2; | frev = rev2; | ||
| printf("RCS file: %s\n", fpath); | |||
| if ((bp = cvs_diff3(file, argv[i], baserev, frev)) == NULL) { | if ((bp = cvs_diff3(file, argv[i], baserev, frev)) == NULL) { | ||
| cvs_log(LP_ERR, "failed to merge"); | cvs_log(LP_ERR, "failed to merge"); | ||
| rcs_close(file); | rcs_close(file); |