1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-29 23:17:32 +02:00
lazygit/pkg/gui/presentation
Stefan Haller ff465e2581 Show original todo action instead of "conflict", and show <-- CONFLICT instead
It is useful to see if the conflicted commit was a "pick" or an "edit". What's
more, we're about to add support for showing cherry-picks and reverts, and
seeing that a conflicted commit was a revert is important because its diff is
backwards compared to the diff of the conflicting files in the Files panel.
2025-04-20 15:55:44 +02:00
..
2025-03-08 14:53:54 -05:00
2025-04-02 18:15:44 +02:00
2024-04-06 13:46:15 +02:00
2023-12-27 11:21:49 +01:00
2024-03-07 20:16:28 +01:00
2024-04-06 13:46:15 +02:00