X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge.c;h=cb8f14910b93edb7f1bfa6a4ee82f6a3d9fd7e40;hb=f524129737d9ba3e685c31bacde844ec1db1fea9;hp=d3e1e8dc9e478aaea7ef4da855fb7c2e10397644;hpb=80809062452a65146d73ae483415acbc737fabf1;p=git.git

diff --git a/builtin/merge.c b/builtin/merge.c
index d3e1e8dc9..cb8f14910 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -399,6 +399,8 @@ static void finish(struct commit *head_commit,
 	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;