diff options
| author | Joris Vink <joris@cvs.openbsd.org> | 2007-01-28 02:04:46 +0000 |
|---|---|---|
| committer | Joris Vink <joris@cvs.openbsd.org> | 2007-01-28 02:04:46 +0000 |
| commit | 36c64f8f20b0a2ff5a43fbf4f9a23b6aa3f65652 (patch) | |
| tree | 967c1006924cdd47b4617230271dfaaa39498cf6 /usr.bin/cvs/diff.h | |
| parent | fbed64cc1fb56f9ce86017aab6f2a884eebf6472 (diff) | |
add merging support in both local and remote sides.
tested by many, thanks.
Diffstat (limited to 'usr.bin/cvs/diff.h')
| -rw-r--r-- | usr.bin/cvs/diff.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h index 6f938614704..16d272fdef3 100644 --- a/usr.bin/cvs/diff.h +++ b/usr.bin/cvs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.13 2006/06/14 14:10:50 joris Exp $ */ +/* $OpenBSD: diff.h,v 1.14 2007/01/28 02:04:45 joris Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -91,7 +91,7 @@ #define D_SKIPPED1 8 /* path1 was a special file */ #define D_SKIPPED2 9 /* path2 was a special file */ -BUF *cvs_diff3(RCSFILE *, char *, int, RCSNUM *, RCSNUM *, int); +void cvs_merge_file(struct cvs_file *, int); void diff_output(const char *, ...); int cvs_diffreg(const char *, const char *, BUF *out); int ed_patch_lines(struct cvs_lines *, struct cvs_lines *); |