diff options
| author |   joris <joris@openbsd.org> | 2005-10-22 17:32:57 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2005-10-22 17:32:57 +0000 |
| commit | 01af718a5e53bf13920b5be53e1d8f65290f038c (patch) | |
| tree | 0fc942a30a1199dc46b2d885bb516b03ccbe0ae1 /usr.bin/cvs/diff.h | |
| parent | - don't check for admin files when running init; (diff) | |
| download | wireguard-openbsd-01af718a5e53bf13920b5be53e1d8f65290f038c.tar.xz wireguard-openbsd-01af718a5e53bf13920b5be53e1d8f65290f038c.zip | |
diff3 support, needed for merging files together;
"go for it" niallo@
Diffstat (limited to 'usr.bin/cvs/diff.h')
| -rw-r--r-- | usr.bin/cvs/diff.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h index 41fc542a2ca..cd261370da4 100644 --- a/usr.bin/cvs/diff.h +++ b/usr.bin/cvs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.3 2005/10/11 14:27:27 joris Exp $ */ +/* $OpenBSD: diff.h,v 1.4 2005/10/22 17:32:57 joris Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -93,8 +93,13 @@ #define D_SKIPPED2 9 /* path2 was a special file */ - +BUF *cvs_diff3(RCSFILE *, char *, RCSNUM *, RCSNUM *); +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 char *diff_file; +extern BUF *diffbuf; + #endif |