diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-05-15 06:58:04 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-05-15 06:58:04 +0000 |
| commit | 62af021f73c6087593eb47c427041d858fe5e493 (patch) | |
| tree | f63fc710980a6bfaaecdcc4887bcd25e70684977 /usr.bin/rcs/diff.h | |
| parent | 46ae12169e313b2340d33da86a2bc7762b047cf0 (diff) | |
missing bits for a working merge(1). Built and enabled.
OK joris@ ray@.
Diffstat (limited to 'usr.bin/rcs/diff.h')
| -rw-r--r-- | usr.bin/rcs/diff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/rcs/diff.h b/usr.bin/rcs/diff.h index f41171f1f41..dfc46f85c05 100644 --- a/usr.bin/rcs/diff.h +++ b/usr.bin/rcs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.3 2006/05/08 18:36:04 xsa Exp $ */ +/* $OpenBSD: diff.h,v 1.4 2006/05/15 06:58:03 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -95,6 +95,7 @@ struct rcs_lines; BUF *rcs_diff3(RCSFILE *, char *, RCSNUM *, RCSNUM *, int); +BUF *merge_diff3(char **, int); void diff_output(const char *, ...); int rcs_diffreg(const char *, const char *, BUF *); int ed_patch_lines(struct rcs_lines *, struct rcs_lines *); |