A tool for extracting git merge conflicts