2 Commits

Author	SHA1	Message	Date
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
Stefan Haller	3d76c734aa	Add test for amending a commit, causing a conflict	2023-06-22 18:57:43 +02:00