diff options
Diffstat (limited to 'usr.bin/rcs/diff.h')
| -rw-r--r-- | usr.bin/rcs/diff.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/rcs/diff.h b/usr.bin/rcs/diff.h index fdf7cfa821e..f41171f1f41 100644 --- a/usr.bin/rcs/diff.h +++ b/usr.bin/rcs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.2 2006/05/05 15:47:36 xsa Exp $ */ +/* $OpenBSD: diff.h,v 1.3 2006/05/08 18:36:04 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -87,6 +87,11 @@ #define D_DIFFER 1 /* Files are different */ #define D_ERROR 2 /* An error occurred */ +/* + * Status values for rcs_diff3() return values + */ +#define D_OVERLAPS 1 /* Overlaps during merge */ + struct rcs_lines; BUF *rcs_diff3(RCSFILE *, char *, RCSNUM *, RCSNUM *, int); |