Sorry, I noticed something else I missed on my last reading...
On Tue, Apr 24, 2018 at 10:11 AM, Ben Peart <Ben.Peart@xxxxxxxxxxxxx> wrote:
> diff --git a/builtin/merge.c b/builtin/merge.c
> index 8746c5e3e8..3be52cd316 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -424,6 +424,7 @@ static void finish(struct commit *head_commit,
> opts.output_format |=
> DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
> opts.detect_rename = DIFF_DETECT_RENAME;
> + git_config_get_bool("merge.renames", &opts.detect_rename);
> diff_setup_done(&opts);
> diff_tree_oid(head, new_head, "", &opts);
> diffcore_std(&opts);
Shouldn't this also be turned off if either (a) merge.renames is unset
and diff.renames is false, or (b) the user specifies -Xno-renames?
