diff options
Diffstat (limited to 'usr.bin/cvs/diff.h')
| -rw-r--r-- | usr.bin/cvs/diff.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h index 67d52f71d79..7d0d7f38f1a 100644 --- a/usr.bin/cvs/diff.h +++ b/usr.bin/cvs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.6 2005/10/26 18:13:58 xsa Exp $ */ +/* $OpenBSD: diff.h,v 1.7 2005/11/21 15:01:10 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -102,9 +102,10 @@ void diff_output(const char *, ...); int cvs_diffreg(const char *, const char *, BUF *out); int ed_patch_lines(struct cvs_lines *, struct cvs_lines *); -extern int diff_format; -extern int diff3_conflicts; +extern int diff_format; +extern int diff3_conflicts; extern char *diff_file; +extern char diffargs[128]; extern BUF *diffbuf; #endif |