Mika Kuns
18479c023e
The between-pane gutter only offered single-side replace (accept ours / accept theirs). Add an 'accept both' (⊕) control under the ours chevron that drops ours-then-theirs into the result region, so a conflict can be combined in one click instead of picking one side and hand-adding the other. en/de keys added.