From: Junio C Hamano <junkio@cox.net>
Date: Sun, 26 Mar 2006 01:44:01 +0000 (-0800)
Subject: Merge branch 'lt/diffgen' into next
X-Git-Tag: v1.3.0-rc1~7
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3;p=git.git

Merge branch 'lt/diffgen' into next

* lt/diffgen:
  built-in diff: minimum tweaks
  builtin-diff: \No newline at end of file.
  Use a *real* built-in diff generator
---

9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3
diff --cc Makefile
index 236bac1f,0f565eb4..663a803d
--- a/Makefile
+++ b/Makefile
@@@ -188,9 -188,10 +188,10 @@@ PYMODULES = 
  	gitMergeCommon.py
  
  LIB_FILE=libgit.a
+ XDIFF_LIB=xdiff/lib.a
  
  LIB_H = \
 -	blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
 +	blob.h cache.h commit.h csum-file.h delta.h \
  	diff.h object.h pack.h pkt-line.h quote.h refs.h \
  	run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h