Re: en/remerge-diff-fixes

Elijah Newren [off-list ref] writes:

So, which of the following would you prefer?
  * A separate series for maint and main?
  * Just ignore maint?
  * Me to rebase on maint to tweak the commit message, and then you
carefully reinstate the line removal as part of the merge back to
main?

None of them X-<.

As this cycle gets close to end, mergeability to 'maint' starts to
matter less and less, so let's stop worrying about this single
instance.