Stefan Haller d79f6c0b38 Add a test for picking both hunks in a diff3 conflict ... Pressing `b` on a conflict is meant to pick both sides. With the diff3 conflict style, git also renders the common ancestor between the two sides, and `b` currently keeps that ancestor section too, which is wrong: the common base is neither side of the merge and must not end up in the resolved file. This test captures the current (buggy) behaviour so the follow-up fix has a clear before/after. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>		2026-07-01 09:24:19 +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	Add a test for picking both hunks in a diff3 conflict	2026-07-01 09:24:19 +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