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

github.com/paulaltin/git-hires-merge

Vaya's read on this project

Problem, audience, market, and the verdict — sign in to see it.

Updates

No recent activity.