diff options
| author |   nicm <nicm@openbsd.org> | 2010-07-28 21:19:30 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2010-07-28 21:19:30 +0000 |
| commit | 72026f1ae0ba0d183d8acb0dfd804d7cdfa7b45e (patch) | |
| tree | 22be5f0174528759b848c8af6f9ce7bbec876c68 /usr.bin/cvs/diff.h | |
| parent | the default pciide chip needs no additional register restores; tested by jcs on one model (diff) | |
| download | wireguard-openbsd-72026f1ae0ba0d183d8acb0dfd804d7cdfa7b45e.tar.xz wireguard-openbsd-72026f1ae0ba0d183d8acb0dfd804d7cdfa7b45e.zip | |
Support -U and -C to specify the context length for "cvs diff".
This doesn't alter cvs rdiff, where -U and -C are not support by GNU
cvs.
ok sthen zinovik
Diffstat (limited to 'usr.bin/cvs/diff.h')
| -rw-r--r-- | usr.bin/cvs/diff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h index 16934ca551d..9c297d51967 100644 --- a/usr.bin/cvs/diff.h +++ b/usr.bin/cvs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.21 2010/07/23 21:46:05 ray Exp $ */ +/* $OpenBSD: diff.h,v 1.22 2010/07/28 21:19:30 nicm Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -108,6 +108,7 @@ int diffreg(const char *, const char *, int, int, BUF *, int); int ed_patch_lines(struct rcs_lines *, struct rcs_lines *); extern int diff_format; +extern int diff_context; extern int diff3_conflicts; extern int diff_aflag; extern int diff_bflag; |