paulaltin/git-subline-merge

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

2 best points · 0 comments · 1 Hacker News post · 71 GitHub stars · View on GitHub

Hacker News discussions