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 /merge-tree.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 'merge-tree.c')
| -rw-r--r-- | merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c index 3b8d9e6887..7d4f628444 100644 --- a/merge-tree.c +++ b/merge-tree.c @@ -106,8 +106,8 @@ static void show_diff(struct merge_list *entry) xdemitcb_t ecb; xpp.flags = XDF_NEED_MINIMAL; + memset(&xecfg, 0, sizeof(xecfg)); xecfg.ctxlen = 3; - xecfg.flags = 0; ecb.outf = show_outf; ecb.priv = NULL; |