summaryrefslogtreecommitdiff
path: root/builtin-rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-07 20:37:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-07 20:37:32 (GMT)
commite3c76dbd0f7531eaed3ca8ec0000f03499839304 (patch)
treeabfeb18cc08e1465390443e12ae7c3d8c7b1cd5b /builtin-rerere.c
parent0707a9d6f200bbafc02d13dd7f2c12bb795999f6 (diff)
parent2c3fa66f3577d1305fb0fac5a181261fb2597859 (diff)
downloadgit-e3c76dbd0f7531eaed3ca8ec0000f03499839304.zip
git-e3c76dbd0f7531eaed3ca8ec0000f03499839304.tar.gz
git-e3c76dbd0f7531eaed3ca8ec0000f03499839304.tar.bz2
Merge branch 'jc/diff-mark'
* jc/diff-mark: diff: honor binariness specified in attributes Fix configuration syntax to specify customized hunk header patterns. Per-path attribute based hunk header selection. Future-proof source for changes in xdemitconf_t Introduce diff_filespec_is_binary()
Diffstat (limited to 'builtin-rerere.c')
-rw-r--r--builtin-rerere.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-rerere.c b/builtin-rerere.c
index 3196151..c25b3d5 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -285,8 +285,8 @@ static int diff_two(const char *file1, const char *label1,
printf("--- a/%s\n+++ b/%s\n", label1, label2);
fflush(stdout);
xpp.flags = XDF_NEED_MINIMAL;
+ memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = 3;
- xecfg.flags = 0;
ecb.outf = outf;
xdl_diff(&minus, &plus, &xpp, &xecfg, &ecb);