jlzhou / git-subline-merge Goto Github PK
View Code? Open in Web Editor NEWThis project forked from paulaltin/git-hires-merge
An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
License: GNU General Public License v3.0