Merge branch 'tr/mergetool-valgrind'

diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index 41e1615a28d772d1677c172ff2f570f31de4026f..f5c6afc5dd46c8f856d0f125287724bbfdc65db7 100644 (file)
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -6,8 +6,7 @@
 *
 */
 
-#include "cache.h"
-#include "exec_cmd.h"
+#include "builtin.h"
 
 #define BLKSIZE 512