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
..
helpers	Drive the side panel layout from gui.sidePanels	2026-06-23 14:15:18 +02:00
attach.go	Add OnQuit hook for controllers	2026-04-21 11:25:29 +02:00
base_controller.go	Copy gocui files into lazygit repo under pkg/gocui	2026-04-30 14:29:08 +02:00
basic_commits_controller.go	Convert keybinding fields to Keybinding	2026-05-25 15:32:47 +02:00
bisect_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
branches_controller.go	Keep selected commits stable across refreshes	2026-06-23 09:20:05 +02:00
command_log_controller.go	Remove return value of Focus-related functions	2024-09-06 08:45:48 +02:00
commit_description_controller.go	Fold remaining alt bindings into their main fields	2026-05-25 15:32:47 +02:00
commit_message_controller.go	Convert keybinding fields to Keybinding	2026-05-25 15:32:47 +02:00
commits_files_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
common.go	lots of changes	2023-04-30 13:19:53 +10:00
confirmation_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
context_lines_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
custom_patch_options_menu_action.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
diffing_menu_action.go	Remove TrimSpace calls that are no longer needed	2025-11-15 15:38:24 +01:00
edit_config_action.go	Extract editConfig into a shared EditConfigAction	2026-06-24 22:03:57 +02:00
files_controller.go	Extract per-case render helpers from FilesController.GetOnRenderToMain	2026-06-28 16:24:02 +02:00
filter_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
filtering_menu_action.go	Remove TrimSpace calls that are no longer needed	2025-11-15 15:38:24 +01:00
git_flow_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
global_controller.go	Add a global keybinding for editing the config file	2026-06-24 22:10:52 +02:00
jump_to_side_window_controller.go	Stop requiring jumpToBlock to have exactly five entries	2026-06-23 14:15:18 +02:00
list_controller.go	Fold remaining alt bindings into their main fields	2026-05-25 15:32:47 +02:00
list_controller_trait.go	Enable nolintlint linter, and fix warnings	2025-06-30 18:30:11 +02:00
local_commits_controller.go	Remove bespoke commit selection restoration when starting a rebase	2026-06-23 09:20:05 +02:00
local_commits_controller_test.go	Move isFixupCommit to FixupHelper	2026-01-24 16:04:35 +01:00
main_view_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
menu_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
menu_key.go	Use a slice of keys for each binding	2026-05-25 15:18:18 +02:00
merge_conflicts_controller.go	Pick both hunks, not the common ancestor, in diff3 conflicts	2026-07-01 09:57:26 +02:00
options_menu_action.go	If a menu entry has multiple keybindings, list them in a tooltip	2026-05-25 15:32:47 +02:00
patch_building_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
patch_explorer_controller.go	Fold remaining alt bindings into their main fields	2026-05-25 15:32:47 +02:00
patch_explorer_controller_test.go	Strip the '+' and '-' characters when copying parts of a diff to the clipboard	2025-04-29 11:33:47 +02:00
prompt_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
quit_actions.go	Copy gocui files into lazygit repo under pkg/gocui	2026-04-30 14:29:08 +02:00
reflog_commits_controller.go	Fix showing diffs for renamed file when filtering by path	2025-07-27 12:05:41 +02:00
remote_branches_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
remotes_controller.go	Make the remote-branches view follow its parent's window	2026-06-23 14:15:18 +02:00
remotes_controller_test.go	feat: add fork remote command	2025-11-16 17:26:00 +01:00
rename_similarity_threshold_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
screen_mode_actions.go	Copy gocui files into lazygit repo under pkg/gocui	2026-04-30 14:29:08 +02:00
scroll_off_margin.go	Replace min/max helpers with built-in min/max	2024-04-07 23:24:10 +08:00
scroll_off_margin_test.go	Add tests for scroll-off margin of zero	2023-08-21 08:10:28 +02:00
search_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
search_prompt_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
shell_command_action.go	Strip leading/trailing whitespace from prompt input	2025-11-15 15:38:24 +01:00
side_window_controller.go	Fold remaining alt bindings into their main fields	2026-05-25 15:32:47 +02:00
snake_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
staging_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
stash_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
status_controller.go	Extract editConfig into a shared EditConfigAction	2026-06-24 22:03:57 +02:00
sub_commits_controller.go	Use async refresh rather than manual OnWorker call	2025-07-02 16:10:04 +02:00
submodules_controller.go	Convert keybinding fields to Keybinding	2026-05-25 15:32:47 +02:00
suggestions_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
switch_to_diff_files_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
switch_to_focused_main_view_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
switch_to_sub_commits_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
sync_controller.go	Keep selected commits stable across refreshes	2026-06-23 09:20:05 +02:00
tags_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
toggle_whitespace_action.go	Move IgnoreWhitespaceInDiffView to user config	2025-07-09 13:15:03 +02:00
undo_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
vertical_scroll_controller.go	Copy gocui files into lazygit repo under pkg/gocui	2026-04-30 14:29:08 +02:00
view_selection_controller.go	Fold remaining alt bindings into their main fields	2026-05-25 15:32:47 +02:00
workspace_reset_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
worktree_options_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00
worktrees_controller.go	Rename Key to Keys in Binding, KeybindingsOpts, and MenuItem	2026-05-25 15:18:18 +02:00