[EDIT] FILE: git-merge-ours

CANCEL