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

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index cdc1cfdd26a95c54cc23717ce53c20a9d1607c90..b12d0bb61240890b3145baa8f051c83005b97dbe 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -6,6 +6,7 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
+#include "config.h"
 #include "quote.h"
 #include "dir.h"
 #include "builtin.h"