/git-subline-merge

An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.

Primary LanguagePythonGNU General Public License v3.0GPL-3.0

No issues in this repository yet.