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/rcs/rcsmerge.c | |
| parent | 8668898cee979c5fe93c8d69bd244c06c802edb8 (diff) | |
diff3_conflicts cleanup; joris ok
Diffstat (limited to 'usr.bin/rcs/rcsmerge.c')
| -rw-r--r-- | usr.bin/rcs/rcsmerge.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c index fbd46429db7..7cc22876173 100644 --- a/usr.bin/rcs/rcsmerge.c +++ b/usr.bin/rcs/rcsmerge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsmerge.c,v 1.5 2005/10/23 11:42:43 niallo Exp $ */ +/* $OpenBSD: rcsmerge.c,v 1.6 2005/10/26 18:13:58 xsa Exp $ */ /* * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> * All rights reserved. @@ -37,8 +37,6 @@ #include "diff.h" #include "rcsprog.h" -extern diff3_conflicts; - static int kflag = RCS_KWEXP_ERR; int |