| commit | dbae1a13363c45d3f77061f61ca73a0c3ed045cf | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Jun 2011 00:03:10 +0000 (29 17:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 30 Jun 2011 00:03:10 +0000 (29 17:03 -0700) | ||
| tree | e20c7222570b55dbcb4ce4cf9bb91ae8149f52ba | treesnapshot (tar.gz zip) |
| parent | 5dc6411edc6ed5d822b65b9f5cf61ab6fe6d3fa8 | commitdiff |
| parent | 0508fe533dfe1b890f6a2d31ca42ba25466e8ff5 | commitdiff |
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
* 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 | diff1 | diff2 | blobhistory |
| userdiff.c | diff1 | diff2 | blobhistory |