![[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.5, 2005/10/23 11:42:43 | version 1.6, 2005/10/26 18:13:58 | ||
|---|---|---|---|
|
|
||
| #include "diff.h" | #include "diff.h" | ||
| #include "rcsprog.h" | #include "rcsprog.h" | ||
| extern diff3_conflicts; | |||
| static int kflag = RCS_KWEXP_ERR; | static int kflag = RCS_KWEXP_ERR; | ||
| int | int |