![[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.2, 2005/10/23 04:07:06 | version 1.3, 2005/10/23 04:25:34 | ||
|---|---|---|---|
|
|
||
| cvs_buf_free(bp); | 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); | rcs_close(file); | ||
| } | } | ||