merge --stat: use the full terminal width

[git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index b4fbc60e6d25157ed022ebd3f2bc8a2aeb774b0c..b1cd90ccc39d224d57129172da9a9c650e627df7 100644 (file)
--- 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;