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

1  2 
Makefile

diff --cc Makefile
Simple merge