Merge branch 'js/diffstat' into next

* js/diffstat:
  diff --stat: no need to ask funcnames nor context.
This commit is contained in:
Junio C Hamano 2006-04-14 00:28:42 -07:00
commit 4d2909e123

4
diff.c
View File

@ -438,8 +438,8 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
xdemitcb_t ecb; xdemitcb_t ecb;
xpp.flags = XDF_NEED_MINIMAL; xpp.flags = XDF_NEED_MINIMAL;
xecfg.ctxlen = 3; xecfg.ctxlen = 0;
xecfg.flags = XDL_EMIT_FUNCNAMES; xecfg.flags = 0;
ecb.outf = xdiff_outf; ecb.outf = xdiff_outf;
ecb.priv = diffstat; ecb.priv = diffstat;
xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb); xdl_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);