diff options
Diffstat (limited to 'contrib/cvs/src/rcs.h')
| -rw-r--r-- | contrib/cvs/src/rcs.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/cvs/src/rcs.h b/contrib/cvs/src/rcs.h index 7aee90a..397488e 100644 --- a/contrib/cvs/src/rcs.h +++ b/contrib/cvs/src/rcs.h @@ -10,8 +10,10 @@ * $FreeBSD$ */ -/* String which indicates a conflict if it occurs at the start of a line. */ -#define RCS_MERGE_PAT ">>>>>>> " +/* Strings which indicate a conflict if they occur at the start of a line. */ +#define RCS_MERGE_PAT_1 "<<<<<<< " +#define RCS_MERGE_PAT_2 "=======\n" +#define RCS_MERGE_PAT_3 ">>>>>>> " #define RCSEXT ",v" #define RCSPAT "*,v" @@ -229,7 +231,9 @@ int RCS_delete_revs PROTO ((RCSNode *, char *, char *, int)); void RCS_addaccess PROTO ((RCSNode *, char *)); void RCS_delaccess PROTO ((RCSNode *, char *)); char *RCS_getaccess PROTO ((RCSNode *)); +RETSIGTYPE rcs_cleanup PROTO ((void)); void RCS_rewrite PROTO ((RCSNode *, Deltatext *, char *)); +void RCS_abandon PROTO ((RCSNode *)); int rcs_change_text PROTO ((const char *, char *, size_t, const char *, size_t, char **, size_t *)); void RCS_setincexc PROTO ((const char *arg)); |
