use the git-merge-parser package