diff --stat: add config option to limit graph width

diff --git a/builtin/merge.c b/builtin/merge.c
index b1cd90ccc39d224d57129172da9a9c650e627df7..34a5034a7667455728c7833513a43ef989d01538 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -400,6 +400,7 @@ static void finish(struct commit *head_commit,
                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;