![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Aug 2011 18:23:24 +0000 (11:23 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Aug 2011 18:23:24 +0000 (11:23 -0700) | ||
| commit | e10e476fb170a99ecc535a31def69d5e3483a859 | |
| tree | 6987fb0785bcbdb69b5a7ad1ec5652df4a49b80c | tree | snapshot |
| parent | 2a6f08ac1f6949ed0072aed3240bc04d80051851 | commit | diff |
| parent | 0508fe533dfe1b890f6a2d31ca42ba25466e8ff5 | commit | diff |
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
* 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 | | blob | history |
| userdiff.c | diff1 | | diff2 | | blob | history |