Edit File: git-merge-tree