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)
commit9101625d9f3482c5d5d02442c63fa9816729fa4f
tree66fc6d79779e52260cb6c409fd000e7e572a33c1
parentb3466cd8e2a63af8a9a8a609f1418a9f2c6f67e6
parent164dcb97f0cd1accaec4ed40c24881f8e9ae4371
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