Prepare "git-merge-tree" for future work