paulaltin / git-hires-merge

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

Alternatives and similar repositories for git-hires-merge:

Users that are interested in git-hires-merge are comparing it to the libraries listed below