Interactive utility to resolve git merge conflicts