feat(merge): add accept-both control to the 3-pane conflict gutter

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.
2026-06-19 10:43:35 +02:00
parent 869dd25a23
commit 18479c023e
3 changed files with 8 additions and 0 deletions
@@ -408,6 +408,7 @@
    "nextConflict": "Nächster Konflikt (F8)",
    "acceptOurs": "Ours ins Ergebnis übernehmen",
    "acceptTheirs": "Theirs ins Ergebnis übernehmen",
+    "acceptBoth": "Beide übernehmen (ours, dann theirs)",
    "continue": "Lösen & fortfahren",
    "abort": "Merge abbrechen"
  },