Junio C Hamano 07cf180cdf Merge branch 'jk/combine-diff-binary-etc' into next ...

* 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

2011-05-24 14:20:35 -07:00

9.2 KiB

Raw Blame History

View Raw