GitHub repository: paulaltin/git-hires-merge
Primary language: Python
Description: An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.