On Thu, Jul 21, 2022 at 9:24 AM Junio C Hamano <gitster@xxxxxxxxx> wrote: > > "Elijah Newren via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes: > > > * stash the changes, in order to clean up after the strategies > > * try all the merge strategies in turn, each of which report they > > cannot function due to the index not matching HEAD > > * restore the changes via "git stash apply" > > A tangent that does not make much difference in the end, but I am > finding these lines curious and somewhat annoying. Why do we have > sandwitching the plain whitespace only on lines that begin > with an asterisk? Eek! That's nasty. I was switching back and forth between responding to emails and coding up fixes, and copy-pasted part of my email into the commit message. So, apparently gmail hates me, and I just didn't notice. I'll clean these up; I'm rerolling for the "error()" cleanup you mentioned anyway.
