From: Junio C Hamano <junkio@cox.net>
Date: Thu, 16 Feb 2006 09:57:39 +0000 (-0800)
Subject: Merge branch 'lt/merge-tree'
X-Git-Tag: v1.3.0-rc1~54^2~67
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9101625d9f3482c5d5d02442c63fa9816729fa4f;p=git.git

Merge branch 'lt/merge-tree'

* lt/merge-tree:
  git-merge-tree: generalize the "traverse <n> trees in sync" functionality
  Handling large files with GIT
  Handling large files with GIT
---

9101625d9f3482c5d5d02442c63fa9816729fa4f