From: Junio C Hamano Date: Thu, 27 Apr 2006 19:50:01 +0000 (-0700) Subject: Fix mismerged update-index from jc/cache-tree branch. X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=bc4d7269f9dc021755a54efc868eba8eb820d2fe;p=git.git Fix mismerged update-index from jc/cache-tree branch. Signed-off-by: Junio C Hamano --- diff --git a/update-index.c b/update-index.c index 4c6bcfae..1c1f13bd 100644 --- 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