utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 07:36:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
jesseduffield.lazygit/docs-master
History
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
..
dev Make copies of the docs and schema folders 2025-11-12 08:44:56 +01:00
keybindings Pick both hunks, not the common ancestor, in diff3 conflicts 2026-07-01 09:57:26 +02:00
Config.md Add a global keybinding for editing the config file 2026-06-24 22:10:52 +02:00
Custom_Command_Keybindings.md Convert keybinding fields to Keybinding 2026-05-25 15:32:47 +02:00
Custom_Pagers.md Reject pager entries that combine multiple diff mechanisms 2026-06-07 15:51:56 +02:00
Fixup_Commits.md Make copies of the docs and schema folders 2025-11-12 08:44:56 +01:00
Range_Select.md Make copies of the docs and schema folders 2025-11-12 08:44:56 +01:00
README.md Make copies of the docs and schema folders 2025-11-12 08:44:56 +01:00
Searching.md Make copies of the docs and schema folders 2025-11-12 08:44:56 +01:00
Stacked_Branches.md Make copies of the docs and schema folders 2025-11-12 08:44:56 +01:00
Undoing.md Fix undo shortcut in Undoing.md 2026-05-26 09:45:41 +02:00

README.md

Documentation Overview