diff options
| author |   joris <joris@openbsd.org> | 2007-01-28 02:04:45 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2007-01-28 02:04:45 +0000 |
| commit | 828954c0357eef5f45855c3e9ddfb238d319dbdd (patch) | |
| tree | 6fa5e586716dd43889defc260955e9c103a0a438 /usr.bin/cvs/diff.h | |
| parent | Only allow a single instance of acpimadt(4). (diff) | |
| download | wireguard-openbsd-828954c0357eef5f45855c3e9ddfb238d319dbdd.tar.xz wireguard-openbsd-828954c0357eef5f45855c3e9ddfb238d319dbdd.zip | |
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 *); |