diff --git a/builtin/merge.c b/builtin/merge.c
index d3e1e8dc9e478aaea7ef4da855fb7c2e10397644..08e01e8a60d7d7f9c60e9e7a3a2f8b4d66c12ce3 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
if (new_head && show_diffstat) {
struct diff_options opts;
diff_setup(&opts);
if (new_head && show_diffstat) {
struct diff_options opts;
diff_setup(&opts);
+ opts.stat_width = -1; /* use full terminal width */
+ opts.stat_graph_width = -1; /* respect statGraphWidth config */
opts.output_format |=
DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
opts.detect_rename = DIFF_DETECT_RENAME;
opts.output_format |=
DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
opts.detect_rename = DIFF_DETECT_RENAME;
if (!fast_forward_only &&
merge_remote_util(commit) &&
merge_remote_util(commit)->obj &&
if (!fast_forward_only &&
merge_remote_util(commit) &&
merge_remote_util(commit)->obj &&
- merge_remote_util(commit)->obj->type == OBJ_TAG) {
- if (option_edit < 0)
- option_edit = 1;
+ merge_remote_util(commit)->obj->type == OBJ_TAG)
allow_fast_forward = 0;
allow_fast_forward = 0;
- }
}
if (option_edit < 0)
}
if (option_edit < 0)