Sean Allred <allred.sean@xxxxxxxxx> writes: > I've driven myself a little nuts trying to reproduce it this morning, > but in doing so I've come to an important discovery: this bug presents > if `core.autocrlf=true` but does *not* present if `core.autocrlf=input`. > > For completeness and future reference, the following script reproduces > the issue on Windows: > > [clip] > > At the end of this script, the 'bad merge' is still the recorded > resolution and no rerere record exists for the 'good merge'. > > Just in case there's another piece of config somehow relevant, here's a > dump of the system that reproduced this: > > [clip] > > It's worth noting at this point that while I believe I reproduced on > macOS last week, that doesn't jive with the available evidence (and I > can't reproduce it on macOS this morning, though I suspect that has more > to do with native use of LF over CRLF than anything else). Is there a good way to convert this to a proper bug report without losing the context? -- Sean Allred
