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

diff --cc Makefile
Simple merge