X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge.c;h=b1cd90ccc39d224d57129172da9a9c650e627df7;hb=7a7159ace6c93ea6c55086dfc7ba7533a3e3c07d;hp=b4fbc60e6d25157ed022ebd3f2bc8a2aeb774b0c;hpb=4daf6fc837f7cc84335958b9d9e8a29e41b4ee8e;p=git.git

diff --git a/builtin/merge.c b/builtin/merge.c
index b4fbc60e6..b1cd90ccc 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -399,6 +399,7 @@ 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.output_format |=
 			DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
 		opts.detect_rename = DIFF_DETECT_RENAME;