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

1.4 KiB

Raw Blame History

View Raw