config: don't implicitly use gitdir or commondir

diff --git a/merge-recursive.c b/merge-recursive.c
index 62decd51cc74a9197abbda28dc8efd6f83287a6b..a85144c23acd4293d0c87a2e468d2c0136fa4d57 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -4,6 +4,7 @@
  * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
  */
 #include "cache.h"
+#include "config.h"
 #include "advice.h"
 #include "lockfile.h"
 #include "cache-tree.h"