From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Aug 2011 18:23:24 +0000 (-0700)
Subject: Merge branch 'jk/combine-diff-binary-etc' into maint
X-Git-Tag: v1.7.6.1~33
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e10e476fb170a99ecc535a31def69d5e3483a859;p=git.git

Merge branch 'jk/combine-diff-binary-etc' into maint

* jk/combine-diff-binary-etc:
  combine-diff: respect textconv attributes
  refactor get_textconv to not require diff_filespec
  combine-diff: handle binary files as binary
  combine-diff: calculate mode_differs earlier
  combine-diff: split header printing into its own function
---

e10e476fb170a99ecc535a31def69d5e3483a859