From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jun 2011 00:03:10 +0000 (-0700)
Subject: Merge branch 'jk/combine-diff-binary-etc'
X-Git-Tag: v1.7.7-rc0~126
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dbae1a13363c45d3f77061f61ca73a0c3ed045cf;p=git.git

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

* 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
---

dbae1a13363c45d3f77061f61ca73a0c3ed045cf