From 711b4b4cf1ca840b2d736322e4d3bb61278b5b96 Mon Sep 17 00:00:00 2001
From: Niall O'Higgins <niallo@cvs.openbsd.org>
Date: Sun, 23 Oct 2005 11:42:44 +0000
Subject: add extern int diff3_conflicts to unbreak. bad joris.

---
 usr.bin/rcs/rcsmerge.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr.bin')

diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index 6ecba371ac8..fbd46429db7 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsmerge.c,v 1.4 2005/10/23 11:04:26 xsa Exp $	*/
+/*	$OpenBSD: rcsmerge.c,v 1.5 2005/10/23 11:42:43 niallo Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -37,6 +37,7 @@
 #include "diff.h"
 #include "rcsprog.h"
 
+extern diff3_conflicts;
 
 static int kflag = RCS_KWEXP_ERR;
 
-- 
cgit v1.2.3