Merge branch 'lt/merge-tree'
authorJunio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:31:22 +0000 (22:31 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 13 Jul 2006 05:31:22 +0000 (22:31 -0700)
commit096b1732343305b7096b1085c23eba8cd83569c7
treec50b023920773dbd284d949ee978bd0bee05df94
parente918c6abac65fb56b381f37cc139753fbe6768a3
parent0c7993839b92f466278439a724023f8be50391c1
Merge branch 'lt/merge-tree'

* lt/merge-tree:
  Improved three-way blob merging code
  Prepare "git-merge-tree" for future work
  xdiff: generate "anti-diffs" aka what is common to two files
Makefile