Non interactive - Githubissues

paulaltin / git-hires-merge

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

GNU General Public License v3.0

62 stars 8 forks source link

Closed paulaltin closed 5 years ago