[EDIT] FILE: git-merge-tree

CANCEL