Merge branch 'js/rerere'

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index ae4dcfbe5b0b8b1e9a03df128b9d0b67706a371b..ae7ae4cd2a9ce392945ad8ed27e4289c27ee24bd 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -3,13 +3,6 @@
  * Fredrik Kuivinen.
  * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
  */
-#include <stdarg.h>
-#include <string.h>
-#include <assert.h>
-#include <sys/wait.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
 #include "cache.h"
 #include "cache-tree.h"
 #include "commit.h"