Merge branch 'lt/merge-tree'
authorJunio C Hamano <junkio@cox.net>
Tue, 21 Feb 2006 08:49:38 +0000 (00:49 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 21 Feb 2006 08:49:38 +0000 (00:49 -0800)
commit8cf828b43c3c1ee6d85622d155a1b0639842f66a
treed3e667fc24e0db2ead60d34e28b99f4391ff8d18
parent6ead3972f54e290b255b9c5379a2f9a35ec9f847
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
Makefile