xdl_merge(): fix a segmentation fault when refining conflicts

[git.git] / diffcore-pickaxe.c

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index d89f314f6d809ebfdfd95104fc653bbfe048b669..de44adabf09dcb47090e7865d6cd77677115d2b6 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -1,8 +1,6 @@
 /*
  * Copyright (C) 2005 Junio C Hamano
  */
-#include <regex.h>
-
 #include "cache.h"
 #include "diff.h"
 #include "diffcore.h"