Merge branch 'master' into next

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index d89f314f6d809ebfdfd95104fc653bbfe048b669..cfcce315babb0edb7ad7be7f2ab2437aaf41eb9d 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -1,12 +1,12 @@
 /*
  * Copyright (C) 2005 Junio C Hamano
  */
-#include <regex.h>
-
 #include "cache.h"
 #include "diff.h"
 #include "diffcore.h"
 
+#include <regex.h>
+
 static unsigned int contains(struct diff_filespec *one,
                             const char *needle, unsigned long len,
                             regex_t *regexp)