From: Junio C Hamano <junkio@cox.net>
Date: Thu, 13 Jul 2006 05:31:22 +0000 (-0700)
Subject: Merge branch 'lt/merge-tree'
X-Git-Tag: v1.4.2-rc1~31
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=096b1732343305b7096b1085c23eba8cd83569c7;p=git.git

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
---

096b1732343305b7096b1085c23eba8cd83569c7