diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2005-10-22 17:32:58 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2005-10-22 17:32:58 +0000 |
| commit | 16e8927d403df86f9f577b0d491d1ef9ac11ce97 (patch) | |
| tree | 074cdbe132f562b97d4cec177fd22af8aa77c729 /usr.bin/cvs/diff.h | |
| parent | 507840a892753fe4ed5a99c4f0105d29e2bea00a (diff) | |
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 |