On Sat, Apr 18, 2020 at 10:04:24AM -0600, Todd C. Miller wrote:
> Looks good to me.  I guess no callers check for rebase_status ==
> GOT_STATUS_MERGE.

Right. rebase_status == CONFLICT is essentially just a flag which aborts
the rebase loop in case a conflict occurs while rebasing a commit.

Thanks for the review!