From: Junio C Hamano <junkio@cox.net>
Date: Wed, 26 Apr 2006 10:39:01 +0000 (-0700)
Subject: Merge branch 'jc/cache-tree' into next
X-Git-Tag: v1.4.1-rc1~179
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7608d4bf977d864a9409d366e25de9740b291d51;p=git.git

Merge branch 'jc/cache-tree' into next

* jc/cache-tree:
  commit-tree: allow generic object name for the tree as well.
  Makefile: remove and create xdiff library from scratch.
  t0000-basic: Add ls-tree recursive test back.
---

7608d4bf977d864a9409d366e25de9740b291d51
diff --cc update-index.c
index 157488ff1,258a88cbe..4c6bcfaed
--- a/update-index.c
+++ b/update-index.c
@@@ -6,8 -6,8 +6,9 @@@
  #include "cache.h"
  #include "strbuf.h"
  #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