Mika Kuns d5eec75bea feat(merge): additive conflict accept — stack ours/theirs in click order ...

Replace the single-side replace (and the short-lived accept-both button) with
additive accepts: each result conflict region starts EMPTY (thin marker bar), and
the gutter controls append a side in click order — > adds ours, < adds theirs
(first pick on top, next below), x clears. Controls stay visible after the first
pick so both sides can be stacked; empty/unresolved regions render a marker so they
stay visible. en/de keys updated; Ui 128 + Localization 16 green.

2026-06-19 10:50:57 +02:00

17 KiB

Raw Blame History

View Raw