diff options
| author |   joris <joris@openbsd.org> | 2006-04-14 23:29:01 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2006-04-14 23:29:01 +0000 |
| commit | 6d7e68508e86dfd47efbb0dd42637f8ac6b85406 (patch) | |
| tree | b1b44550dd115cea83e34879d01f92fa149ccc54 /usr.bin/cvs/diff.h | |
| parent | - swap a hack for a slightly nicer hack using a global variable. this avoids (diff) | |
| download | wireguard-openbsd-6d7e68508e86dfd47efbb0dd42637f8ac6b85406.tar.xz wireguard-openbsd-6d7e68508e86dfd47efbb0dd42637f8ac6b85406.zip | |
- don't append the extension if it's already there (PR 5076).
- show magic branches in rlog (thanks for that nicer hack niall).
- correct output in rcsdiff, so we perfectly match gnu's
all these bugs were found by sturm@ while he was using cvsweb
(which uses the RCS tools).
"it is in my view that you should put it in" niallo@
Diffstat (limited to 'usr.bin/cvs/diff.h')
| -rw-r--r-- | usr.bin/cvs/diff.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h index 16abe669f7c..0e3c56480ee 100644 --- a/usr.bin/cvs/diff.h +++ b/usr.bin/cvs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.9 2006/04/10 09:57:32 xsa Exp $ */ +/* $OpenBSD: diff.h,v 1.10 2006/04/14 23:29:01 joris Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -107,5 +107,7 @@ extern int diff3_conflicts; extern char *diff_file; extern char diffargs[128]; extern BUF *diffbuf; +extern RCSNUM *diff_rev1; +extern RCSNUM *diff_rev2; #endif |