Merge branch 'bw/config-h'

diff --git a/diff.c b/diff.c
index e3d7e915783dd3a76d7fdc88cad5624fb009776c..41295d4ea9ff5564fa73d45aaa3afaab20103d87 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2,6 +2,7 @@
  * Copyright (C) 2005 Junio C Hamano
  */
 #include "cache.h"
+#include "config.h"
 #include "tempfile.h"
 #include "quote.h"
 #include "diff.h"