Stefan HallerandClaude Opus 4.8 ed3f4db4f9 Pick both hunks, not the common ancestor, in diff3 conflicts ...

`b` on a merge conflict is meant to keep both sides. With the diff3
conflict style git additionally renders the common ancestor between the
two sides, and the old ALL selection kept everything between the
outermost markers, dragging that ancestor into the resolved file.

Rename the selection from ALL to BOTH and restrict it to the top and
bottom hunks so the common base is dropped. Without the diff3 style
there is no ancestor section, so the behaviour there is unchanged.

The user-facing keybinding config was already named pickBothHunks; only
the internal enum, handler, translation and log string still said "all".

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

2026-07-01 09:57:26 +02:00

..

find_conflicts_test.go

Fix linter warnings about ignoring errors from bufio.Scanner

2026-05-03 16:57:24 +02:00

find_conflicts.go

Fix linter warnings about ignoring errors from bufio.Scanner

2026-05-03 16:57:24 +02:00

merge_conflict.go

Pick both hunks, not the common ancestor, in diff3 conflicts

2026-07-01 09:57:26 +02:00

rendering.go

Fix linter warning about inefficient string concatenation

2026-05-03 16:39:41 +02:00

state_test.go

Remove redundant variable dedeclarations

2024-05-19 16:38:21 +10:00

state.go

Remove utils.Clamp, use lo.Clamp instead

2025-04-21 18:03:18 +02:00