paulaltin / git-hires-merge

An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.
62Updated 3 months ago

Related projects

Alternatives and complementary repositories for git-hires-merge