From: Junio C Hamano <junkio@cox.net>
Date: Tue, 21 Feb 2006 08:49:38 +0000 (-0800)
Subject: Merge branch 'lt/merge-tree'
X-Git-Tag: v1.3.0-rc1~176
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8cf828b43c3c1ee6d85622d155a1b0639842f66a;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
---

8cf828b43c3c1ee6d85622d155a1b0639842f66a