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
Allow invoking script manually on a conflicted file from the command … #3
Closed
paulaltin closed 5 years ago
…line.