Bruno Haible <br...@clisp.org> writes: > Andreas Schwab wrote: >> >> As required by git. >> > >> > What do you mean by that? >> >> See rerere.c:is_cmarker. > > Please give a "how to reproduce".
Enable rerere and cherry-pick a conflicting changelog. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."