Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
config.c: drop hashmap_cmp_fn cast
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index ce48ed7e86137710283f775d4152c9870cfabeea..59e5ee41a8cdde0613e5dfa890cb52b21666868f 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"