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

diff --cc Makefile
index 236bac1,0f565eb..663a803
--- 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