version 1.15, 2008/02/03 18:18:44 |
version 1.16, 2008/02/27 22:34:04 |
|
|
|
|
void cvs_merge_file(struct cvs_file *, int); |
void cvs_merge_file(struct cvs_file *, int); |
void diff_output(const char *, ...); |
void diff_output(const char *, ...); |
int cvs_diffreg(const char *, const char *, BUF *out); |
int cvs_diffreg(const char *, const char *, int, int, BUF *); |
int ed_patch_lines(struct cvs_lines *, struct cvs_lines *); |
int ed_patch_lines(struct cvs_lines *, struct cvs_lines *); |
|
|
extern int diff_format; |
extern int diff_format; |