From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 7 Jul 2007 20:37:32 +0000 (-0700)
Subject: Merge branch 'jc/diff-mark'
X-Git-Tag: v1.5.3-rc1~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3c76dbd0f7531eaed3ca8ec0000f03499839304;p=git.git

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()
---

e3c76dbd0f7531eaed3ca8ec0000f03499839304