feature: per-line picks & editable result in merge conflict editor - #2815

feature: per-line picks & editable result in merge conflict editor#2815

bertyhell wants to merge 3 commits into

sourcegit-scm:developsourcegit-scm/sourcegit:developfrom

bertyhell:feature/merge-editor-line-picksbertyhell/sourcegit:feature/merge-editor-line-picksCopy head branch name to clipboard