aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-20 16:18:16 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-20 16:18:16 -0700
commite28a8670a66125aa29d7a5ea10052c0f6824c2ba (patch)
tree6506300a0123f026feabacf2eae76a665390c8eb /diff.c
parent3814c07498f87e7d27b55175ca2852fcc4cd27f4 (diff)
parent9b99e641c11044dba661f574f9098d362a3f0ef8 (diff)
downloadgit-e28a8670a66125aa29d7a5ea10052c0f6824c2ba.tar.gz
git-e28a8670a66125aa29d7a5ea10052c0f6824c2ba.tar.xz
Merge branch 'maint'
* maint: Update draft release notes for 1.6.0.1 Add hints to revert documentation about other ways to undo changes Install templates with the user and group of the installing personality "git-merge": allow fast-forwarding in a stat-dirty tree completion: find out supported merge strategies correctly decorate: allow const objects to be decorated for-each-ref: cope with tags with incomplete lines diff --check: do not get confused by new blank lines in the middle remote.c: remove useless if-before-free test mailinfo: avoid violating strbuf assertion git format-patch: avoid underrun when format.headers is empty or all NLs
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 10d54405d..5923fe281 100644
--- 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);