qgitc (pypi): A file conflict viewer for git
Keywords: git|conflict|viewer