Stefan Haller 860f89e0c9 Route space to the conflict picker for non-textual conflicts ... For a non-textual conflict (e.g. DD/AU/UA/UD/DU), pressing space used to run the normal stage path, which did something unclear: `git add` happens to resolve the conflict by keeping the file, but that's neither obvious nor symmetric. Route a single such file to the same Keep/Delete picker that enter opens, so space and enter agree. For a range selection that includes one of these conflicts, staging makes no sense, so disable it with a toast that points the user at resolving them one at a time. (Entering a range was already disabled with the standard toast.) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>		2026-06-28 16:12:36 +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
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