Merge branch 'lt/merge-tree'
authorJunio C Hamano <junkio@cox.net>
Thu, 16 Feb 2006 09:57:39 +0000 (01:57 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 16 Feb 2006 09:57:39 +0000 (01:57 -0800)
* lt/merge-tree:
git-merge-tree: generalize the "traverse <n> trees in sync" functionality
Handling large files with GIT
Handling large files with GIT

Trivial merge