@matheusbsbs / matheus-bagliano / commits / 096b173234
Fork 0

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

Junio C Hamano committed Jul 12, 2006 at 22:31 UTC 096b1732343305b7096b1085c23eba8cd83569c7

No changes.