tree abfeb18cc08e1465390443e12ae7c3d8c7b1cd5b
parent 0707a9d6f200bbafc02d13dd7f2c12bb795999f6
parent 2c3fa66f3577d1305fb0fac5a181261fb2597859
author Junio C Hamano <gitster@pobox.com> 1183840652 -0700
committer Junio C Hamano <gitster@pobox.com> 1183840652 -0700

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