Krystof GartnerandStefan Haller 703f053a7e Add merge options menu ...

Replace merge-tool with merge options menu that allows resolving all
conflicts for selected files as ours, theirs, or union, while still
providing access to the merge tool.

2025-10-09 08:45:58 +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

undo_choose_hunk.go

Construct arg vector manually rather than parse string

2023-05-23 19:49:19 +10:00