Fix mismerged update-index from jc/cache-tree branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/update-index.c b/update-index.c
index 4c6bcfa..1c1f13b 100644 (file)
--- a/update-index.c
+++ b/update-index.c
@@ -8,7 +8,6 @@
 #include "quote.h"
 #include "cache-tree.h"
 #include "tree-walk.h"
-#include "cache-tree.h"
 
 /*
  * Default to not allowing changes to the list of files. The