diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-10-26 18:13:59 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-10-26 18:13:59 +0000 |
| commit | 81a0e95dd3803d07d27abbe075a425a6a8973a29 (patch) | |
| tree | f6c56cfb7f4b2ce95199fb5073329a3252e52e39 /usr.bin/cvs/diff.h | |
| parent | 8668898cee979c5fe93c8d69bd244c06c802edb8 (diff) | |
diff3_conflicts cleanup; joris ok
Diffstat (limited to 'usr.bin/cvs/diff.h')
| -rw-r--r-- | usr.bin/cvs/diff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/cvs/diff.h b/usr.bin/cvs/diff.h index 52fa3775100..67d52f71d79 100644 --- a/usr.bin/cvs/diff.h +++ b/usr.bin/cvs/diff.h @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.h,v 1.5 2005/10/22 19:05:25 joris Exp $ */ +/* $OpenBSD: diff.h,v 1.6 2005/10/26 18:13:58 xsa Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. * All rights reserved. @@ -103,6 +103,7 @@ int cvs_diffreg(const char *, const char *, BUF *out); int ed_patch_lines(struct cvs_lines *, struct cvs_lines *); extern int diff_format; +extern int diff3_conflicts; extern char *diff_file; extern BUF *diffbuf; |