commit 25d0340b7ef4cde52e87819c9bf54d65fe136a58
from: Stefan Sperling <stsp@stsp.name>
date: Fri Feb 08 11:27:42 2019 UTC

get rid of an unused global in diff3 code

commit - 5176f942be3e3d8d458985cc7acfb6d320013692
commit + 25d0340b7ef4cde52e87819c9bf54d65fe136a58
blob - cae0de0be2cb9f50415ded99704012bf604f72af
blob + f0f049301e08a5536778079b5efbbced9a1d3edf
--- lib/diff3.c
+++ lib/diff3.c
@@ -171,8 +171,6 @@ static void separate(const char *, struct diff3_state 
 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, ...)