diff options
author | 2009-04-28 09:05:39 +0000 | |
---|---|---|
committer | 2009-04-28 09:05:39 +0000 | |
commit | 6412cad2983db5de72385adb81835d4f4005f38e (patch) | |
tree | 95258517006720f2619614271b478ac643b6b6af /usr.bin/cvs/diff.h | |
parent | Add the possibility to go back from merging mode to the previous menu. (diff) | |
download | wireguard-openbsd-6412cad2983db5de72385adb81835d4f4005f38e.tar.xz wireguard-openbsd-6412cad2983db5de72385adb81835d4f4005f38e.zip |
support some additional diff options: -a, -b, -d, -w
ok joris@
Diffstat (limited to 'usr.bin/cvs/diff.h')
-rw-r--r-- | usr.bin/cvs/diff.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h index 60d629d3e4b..afedf4a7021 100644 --- a/usr.bin/cvs/diff.h +++ b/usr.bin/cvs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.17 2008/03/08 20:26:34 joris Exp $ */ +/* $OpenBSD: diff.h,v 1.18 2009/04/28 09:05:40 sthen Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -98,8 +98,12 @@ int ed_patch_lines(struct cvs_lines *, struct cvs_lines *); extern int diff_format; extern int diff3_conflicts; +extern int diff_aflag; +extern int diff_bflag; +extern int diff_dflag; extern int diff_iflag; extern int diff_pflag; +extern int diff_wflag; extern char *diff_file; extern char diffargs[128]; extern BUF *diffbuf; |