summaryrefslogtreecommitdiffstats
path: root/diff-merges.h
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2021-04-13 13:41:16 +0200
committerJunio C Hamano <gitster@pobox.com>2021-04-17 08:38:35 +0200
commit38fc4dbbc2f110192752a3b2c99abb745f0494bf (patch)
tree69a0410fe1c476668a112e69b218c8af080569f7 /diff-merges.h
parentdiff-merges: refactor set_diff_merges() (diff)
downloadgit-38fc4dbbc2f110192752a3b2c99abb745f0494bf.tar.xz
git-38fc4dbbc2f110192752a3b2c99abb745f0494bf.zip
diff-merges: adapt -m to enable default diff format
Let -m option (and --diff-merges=m) enable the default format instead of "separate", to be able to tune it with log.diffMerges option. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.h')
0 files changed, 0 insertions, 0 deletions