Merge branch 'jk/combine-diff-binary-etc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:10 +0000 (17:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jun 2011 00:03:10 +0000 (17:03 -0700)
* 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

1  2 
diff.c
userdiff.c

diff --cc diff.c
Simple merge
diff --cc userdiff.c
Simple merge