Merge branch 'lt/diffgen' into next
commit9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3
authorJunio C Hamano <junkio@cox.net>
Sun, 26 Mar 2006 01:44:01 +0000 (25 17:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 26 Mar 2006 01:44:01 +0000 (25 17:44 -0800)
tree5fd3aab2074522c1218848ec7b64a0bf59ed4196
parent48d6e97afe4dcce3bb01922b768cc4d831923e7f
parent3ce8f08944e614813c7dfb212a88b7c4e3b443bc
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
Makefile
diff.c