3 Commits

Author	SHA1	Message	Date
Stefan Haller	74054c9d70	Remove the "YOU ARE HERE" marker ... Now that we have sections, it is no longer needed. Keep the "<-- CONFLICTS" marker though.	2025-04-20 16:06:15 +02:00
Stefan Haller	6cbc1e0ace	Add section headers for rebase todos, cherry-picks, reverts, and actual commits	2025-04-20 16:06:15 +02:00
Stefan Haller	ba160cb5db	Add test for a pick that fails and gets rescheduled ... This test is interesting because it already behaves as desired: since git has rescheduled the "pick" command, we do _not_ want to show a "conflict" entry in this case, as we would see the same commit twice then.	2023-06-22 18:57:43 +02:00