Merge branch 'maint'

diff --git a/diff.c b/diff.c
index 10d54405d21888d41a1e20f27358e15ba5b679d5..5923fe281b6ab421f785a1d47afd6dee5711e52d 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1628,6 +1628,7 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
                xdemitcb_t ecb;
 
                memset(&xecfg, 0, sizeof(xecfg));
+               xecfg.ctxlen = 1; /* at least one context line */
                xpp.flags = XDF_NEED_MINIMAL;
                xdi_diff_outf(&mf1, &mf2, checkdiff_consume, &data,
                              &xpp, &xecfg, &ecb);