merge-conflicts
===============

tool for detecting merge conflicts in git repositories