Stefan Haller 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
..
filter.go	Add a root item ("/") if files at top level have changed	2025-03-21 08:04:58 +01:00
merge_file_both.go	Add merge options menu	2025-10-09 08:45:58 +02:00
merge_file_current.go	Add merge options menu	2025-10-09 08:45:58 +02:00
merge_file_incoming.go	Add merge options menu	2025-10-09 08:45:58 +02:00
pick_both_hunks_diff3.go	Pick both hunks, not the common ancestor, in diff3 conflicts	2026-07-01 09:57:26 +02:00
resolve_externally.go	Mention which command is continued in PromptToContinueRebase	2025-04-20 15:53:17 +02:00
resolve_multiple_files.go	Mention which command is continued in PromptToContinueRebase	2025-04-20 15:53:17 +02:00
resolve_no_auto_stage.go	Add a root item ("/") if files at top level have changed	2025-03-21 08:04:58 +01:00
resolve_non_textual_conflicts.go	Provide conflict resolution dialogs for non-textual conflicts	2025-04-09 10:27:57 +02:00
resolve_without_trailing_lf.go	Mention which command is continued in PromptToContinueRebase	2025-04-20 15:53:17 +02:00
space_on_non_textual_conflict.go	Route space to the conflict picker for non-textual conflicts	2026-06-28 16:12:36 +02:00
undo_choose_hunk.go	Construct arg vector manually rather than parse string	2023-05-23 19:49:19 +10:00