1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-24 05:36:19 +02:00
lazygit/pkg/gui/controllers
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-04-30 13:19:52 +10:00
2023-04-30 13:19:52 +10:00
2023-04-30 13:19:53 +10:00
2023-04-30 13:19:53 +10:00
2023-04-30 13:19:53 +10:00
2023-04-30 13:19:53 +10:00
2023-04-30 13:19:53 +10:00
2023-04-30 13:19:53 +10:00
2022-04-02 17:04:42 +11:00
2023-04-30 13:19:53 +10:00