Krystof Gartner 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

..

Custom_Keybindings.md

Add a few missing keybindings to docs/keybindings/Custom_Keybindings.md

2025-02-21 13:20:33 +01:00

Keybindings_en.md

Add merge options menu

2025-10-09 08:45:58 +02:00

Keybindings_ja.md

Add merge options menu

2025-10-09 08:45:58 +02:00

Keybindings_ko.md

Add merge options menu

2025-10-09 08:45:58 +02:00

Keybindings_nl.md

Add merge options menu

2025-10-09 08:45:58 +02:00

Keybindings_pl.md

Add merge options menu

2025-10-09 08:45:58 +02:00

Keybindings_pt.md

Add merge options menu

2025-10-09 08:45:58 +02:00

Keybindings_ru.md

Add merge options menu

2025-10-09 08:45:58 +02:00

Keybindings_zh-CN.md

Add merge options menu

2025-10-09 08:45:58 +02:00

Keybindings_zh-TW.md

Add merge options menu

2025-10-09 08:45:58 +02:00