gitconflict (pypi): Git merge-conflicts checker
Keywords: git|merge|conflict|detector|git-aflow