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