diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-07 13:37:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-07 13:37:32 -0700 |
| commit | e3c76dbd0f7531eaed3ca8ec0000f03499839304 (patch) | |
| tree | abfeb18cc08e1465390443e12ae7c3d8c7b1cd5b /combine-diff.c | |
| parent | 0707a9d6f200bbafc02d13dd7f2c12bb795999f6 (diff) | |
| parent | 2c3fa66f3577d1305fb0fac5a181261fb2597859 (diff) | |
| download | git-e3c76dbd0f7531eaed3ca8ec0000f03499839304.tar.gz | |
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 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c index ea3ca5f950..ef622340a5 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -215,8 +215,7 @@ static void combine_diff(const unsigned char *parent, mmfile_t *result_file, parent_file.ptr = grab_blob(parent, &sz); parent_file.size = sz; xpp.flags = XDF_NEED_MINIMAL; - xecfg.ctxlen = 0; - xecfg.flags = 0; + memset(&xecfg, 0, sizeof(xecfg)); ecb.outf = xdiff_outf; ecb.priv = &state; memset(&state, 0, sizeof(state)); |