1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-20 05:19:24 +02:00
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-25 23:52:19 +10:00
2023-05-25 23:52:19 +10:00
2023-05-25 23:52:19 +10:00
2023-05-25 23:52:19 +10:00
2023-06-03 15:54:03 +10:00
2023-05-25 23:52:19 +10:00
2023-05-25 23:52:19 +10:00
2023-05-25 23:52:19 +10:00
2023-05-25 23:52:19 +10:00
2023-02-26 12:54:13 +11:00