4 Commits

Author	SHA1	Message	Date
Stefan Haller	362678e2ef	Mention which command is continued in PromptToContinueRebase ... When you are in the middle of a rebase, and you cherry-pick a commit which conflicts, it helps to be clear on whether you are prompted to continue the cherry-pick or the rebase.	2025-04-20 15:53:17 +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
Stefan Haller	cddf056f4d	Extend test to expect what commits we want to be listed when there's a conflict	2023-06-22 18:57:43 +02:00
Jesse Duffield	f7e8b2dd71	cleanup integration test code	2023-02-26 12:54:13 +11:00