search

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

Support interactive.singlekey #22

Open SuperSandro2000 opened 11 months ago

SuperSandro2000 commented 11 months ago

Right now when resolving a merge conflict, interactive.singlekey is not supported unlikely when selecting hunks to stage/commit.

see https://git-scm.com/docs/git-config#Documentation/git-config.txt-interactivesingleKey