On Thu, Apr 08, 2021 at 01:56:02AM +0300, Sergey Organov wrote:

New log.diffMerges configuration variable sets the format that
--diff-merges=def will be using. The default is "separate".

Signed-off-by: Sergey Organov <redacted>
---
 builtin/log.c |  2 ++
 diff-merges.c | 11 +++++++++++
 diff-merges.h |  2 ++
 3 files changed, 15 insertions(+)

Please don't forget to document this new configuration variable.