Merge git://ozlabs.org/~paulus/gitk

diff --git a/diff.c b/diff.c
index 976362a8ce0ae46160d44fd8bbabef4050769dc9..08508f6a2017eb35a350268ea78a44cfc1d867e4 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -14,6 +14,7 @@
 #include "utf8.h"
 #include "userdiff.h"
 #include "sigchain.h"
+#include "submodule-config.h"
 #include "submodule.h"
 #include "ll-merge.h"
 #include "string-list.h"