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

"Run manually on a conflicted file" should be shown in the README #14

Closed dabrahams closed 4 years ago

dabrahams commented 4 years ago

A small thing, but it's not clear from the README how one invokes GSM to "run it manually on a conflicted file."

paulaltin commented 4 years ago

Good catch, thanks! I've updated the README with usage notes.