On Wed, Aug 05, 2020 at 12:21:03AM +0300, Sergey Organov wrote: > Here is the patch reduced to absolute minimum, both functionally and > textually. I removed even 'all', as it has its own subtleties that need > further discussion, so the patch only introduces --diff-merges=off. Yeah, I agree this is the minimum (though I suspect the documentation may be easier with "all" or similar to explain "-m" in terms of --diff-merges). > If it looks OK, I'll do documentation and tests parts. My nits about the die() message remain, but other than that it looks OK to me. -Peff
