On Tue, Nov 01, 2016 at 02:45:19PM -0700, Junio C Hamano wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > > > And here is _with_ renaming. I think "compaction heuristics" is a > > much better phrase to call "heuristics used during the diff hunk > > compaction process" without specifying how that heuristics work > > (like taking hints in the indentation levels). If we are to retire > > one while keeping the other, compaction-heuristics should be the > > name we give and keep for the surviving one. > > > > I have not much confidence in the conversion result, though. > > I'll queue it on 'pu' for now, before I go offline for a few days, > with the following log message: Thanks. I think this is good, with the exception of the "One of these" bits that remains in diff-config.txt. I think Michael is OK with this approach based on previous discussions, but we should get his Ack, too. -Peff