diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2021-04-13 14:41:16 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-04-16 23:38:35 -0700 |
| commit | 38fc4dbbc2f110192752a3b2c99abb745f0494bf (patch) | |
| tree | 69a0410fe1c476668a112e69b218c8af080569f7 /t/t5515/fetch.br-config-explicit-merge_config-explicit | |
| parent | diff-merges: refactor set_diff_merges() (diff) | |
| download | tgif-38fc4dbbc2f110192752a3b2c99abb745f0494bf.tar.xz | |
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 't/t5515/fetch.br-config-explicit-merge_config-explicit')
0 files changed, 0 insertions, 0 deletions