GitHub repository: paulaltin/git-subline-merge
Primary language: Python
Created: 2018-09-11T00:57:55Z
Description: An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.