Andrew's git / gitweb.git / diff
?
Merge branch 'lt/diffgen' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 26 Mar 2006 01:44:01 +0000 (17:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 26 Mar 2006 01:44:01 +0000 (17:44 -0800)
* lt/diffgen:
built-in diff: minimum tweaks
builtin-diff: \No newline at end of file.
Use a *real* built-in diff generator

1  2 
Makefile patch | diff1 | diff2 | blob | history
diff.c patch | diff1 | diff2 | blob | history
diff --cc Makefile
index 236bac1f25207ed7976e7777994c6fc1cab5052b,0f565eb4d3c488e5a8b5c64c053821b78989f6c8..663a803dd8e0d017fd447108abd670e8ed3c64dc
--- 1/Makefile
--- 2/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
  
diff --cc diff.c
Simple merge