thodg/got

diff --git a/lib/diff3.c b/lib/diff3.c
index cae0de0..f0f0493 100644
--- a/lib/diff3.c
+++ b/lib/diff3.c
@@ -172,8 +172,6 @@ static const struct got_error *increase(struct diff3_state *);
 static const struct got_error *diff3_internal(char *, char *, char *,
     char *, char *, const char *, const char *, struct diff3_state *);
 
-int diff3_conflicts = 0;
-
 static const struct got_error *
 diff_output(BUF *diffbuf, const char *fmt, ...)
 {