Merge branch 'jk/combine-diff-binary-etc' into maint
commite10e476fb170a99ecc535a31def69d5e3483a859
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:23:24 +0000 (16 11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 Aug 2011 18:23:24 +0000 (16 11:23 -0700)
tree6987fb0785bcbdb69b5a7ad1ec5652df4a49b80c
parent2a6f08ac1f6949ed0072aed3240bc04d80051851
parent0508fe533dfe1b890f6a2d31ca42ba25466e8ff5
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
diff.c
userdiff.c