1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-18 05:17:55 +02:00
lazygit/pkg/gui/presentation
Stefan Haller 3928d0ebda Insert fake todo entry for a conflicting commit that is being applied
When stopping in a rebase because of a conflict, it is nice to see the commit
that git is trying to apply. Create a fake todo entry labelled "conflict" for
this, and show the "<-- YOU ARE HERE ---" string for that one (in red) instead
of for the real current head.
2023-06-22 18:57:58 +02:00
..
2023-05-21 12:09:43 +10:00
2023-06-15 21:47:52 +02:00
2023-06-01 19:21:24 +10:00
2023-03-19 16:35:57 +11:00
2022-03-17 19:13:40 +11:00
2022-04-23 12:25:42 +09:00
2022-10-14 21:58:58 +09:00
2022-03-24 20:14:41 +11:00
2022-03-24 20:14:41 +11:00
2023-02-20 19:01:08 +11:00
2023-05-25 23:52:19 +10:00