Phillip Wood [off-list ref] writes:
On 26/03/2021 07:16, Elijah Newren via GitGitGadget wrote:
quoted
From: Elijah Newren <redacted>
save_opts() should save any non-default values. It was intended to
do
this, but since most options in struct replay_opts default to 0, it only
saved non-zero values. Unfortunatley,
s/Unfortunatley/Unfortunately/ also s/iff/if/ in a few places below.
I think the latter is delibrate use of common abbreviation of "if
and only if".
It might be worth emphasizing that despite its name
continue_single_pick() is used to commit conflict resolutions
regardless of the number of picks - I had to check the code to see
what it was doing in the multi-pick case.
metoo ;-)
I was surprised how big a change was required to the existing code but
it seems this is surprising tricky to get right - I cannot think of
any simplifications.
Thanks for a review.