Merge branch 'sb/hashmap-customize-comparison' into sb/diff-color-move

diff --git a/builtin/diff.c b/builtin/diff.c
index d9152c21bf5a8aa41778f838b4d804ac698bdc2b..7cde6abbcf7651af8313bd3d70eb1944e72c9cb3 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -4,6 +4,7 @@
  * Copyright (c) 2006 Junio C Hamano
  */
 #include "cache.h"
+#include "config.h"
 #include "lockfile.h"
 #include "color.h"
 #include "commit.h"