Merge branch 'jc/maint-diffstat-numstat-context' into maint
* jc/maint-diffstat-numstat-context: diff: teach --stat/--numstat to honor -U$num
This commit is contained in:
commit
eee947fb95
2
diff.c
2
diff.c
@ -2274,6 +2274,8 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
|
||||
memset(&xpp, 0, sizeof(xpp));
|
||||
memset(&xecfg, 0, sizeof(xecfg));
|
||||
xpp.flags = o->xdl_opts;
|
||||
xecfg.ctxlen = o->context;
|
||||
xecfg.interhunkctxlen = o->interhunkcontext;
|
||||
xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
|
||||
&xpp, &xecfg);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user