make "git merge-tree" a built-in