| rcs.h (128269) | rcs.h (131688) |
|---|---|
| 1/* 2 * Copyright (c) 1992, Brian Berliner and Jeff Polk 3 * Copyright (c) 1989-1992, Brian Berliner 4 * 5 * You may distribute under the terms of the GNU General Public License as 6 * specified in the README file that comes with the CVS source distribution. 7 * 8 * RCS source control definitions needed by rcs.c and friends 9 * | 1/* 2 * Copyright (c) 1992, Brian Berliner and Jeff Polk 3 * Copyright (c) 1989-1992, Brian Berliner 4 * 5 * You may distribute under the terms of the GNU General Public License as 6 * specified in the README file that comes with the CVS source distribution. 7 * 8 * RCS source control definitions needed by rcs.c and friends 9 * |
| 10 * $FreeBSD: head/contrib/cvs/src/rcs.h 128269 2004-04-15 01:17:28Z peter $ | 10 * $FreeBSD: head/contrib/cvs/src/rcs.h 131688 2004-07-06 08:10:38Z des $ |
| 11 */ 12 13/* Strings which indicate a conflict if they occur at the start of a line. */ 14#define RCS_MERGE_PAT_1 "<<<<<<< " 15#define RCS_MERGE_PAT_2 "=======\n" 16#define RCS_MERGE_PAT_3 ">>>>>>> " 17 18#define RCSEXT ",v" --- 226 unchanged lines hidden (view full) --- 245 size_t, char **, size_t *)); 246void RCS_deltas PROTO ((RCSNode *, FILE *, struct rcsbuffer *, const char *, 247 enum rcs_delta_op, char **, size_t *, 248 char **, size_t *)); 249void RCS_setincexc PROTO ((const char *arg)); 250void RCS_setlocalid PROTO ((const char *arg)); 251char *make_file_label PROTO ((const char *, const char *, RCSNode *)); 252 | 11 */ 12 13/* Strings which indicate a conflict if they occur at the start of a line. */ 14#define RCS_MERGE_PAT_1 "<<<<<<< " 15#define RCS_MERGE_PAT_2 "=======\n" 16#define RCS_MERGE_PAT_3 ">>>>>>> " 17 18#define RCSEXT ",v" --- 226 unchanged lines hidden (view full) --- 245 size_t, char **, size_t *)); 246void RCS_deltas PROTO ((RCSNode *, FILE *, struct rcsbuffer *, const char *, 247 enum rcs_delta_op, char **, size_t *, 248 char **, size_t *)); 249void RCS_setincexc PROTO ((const char *arg)); 250void RCS_setlocalid PROTO ((const char *arg)); 251char *make_file_label PROTO ((const char *, const char *, RCSNode *)); 252 |
| 253extern int datesep; |
|
| 253extern int preserve_perms; 254 255/* From import.c. */ 256extern int add_rcs_file PROTO ((const char *, const char *, const char *, 257 const char *, const char *, const char *, 258 const char *, int, char **, const char *, 259 size_t, FILE *)); | 254extern int preserve_perms; 255 256/* From import.c. */ 257extern int add_rcs_file PROTO ((const char *, const char *, const char *, 258 const char *, const char *, const char *, 259 const char *, int, char **, const char *, 260 size_t, FILE *)); |