| commit | 07cf180cdf7b57073e34f7ace65768f415fbf03f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 May 2011 21:20:35 +0000 (24 14:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 May 2011 21:20:35 +0000 (24 14:20 -0700) | ||
| tree | 1bcc727b89f55b9233cda4bf9735b70fb6591110 | treesnapshot (tar.gz zip) |
| parent | fbd4877f301a9ed26bffbebd340b19d5a18c8573 | commitdiff |
| parent | 0508fe533dfe1b890f6a2d31ca42ba25466e8ff5 | commitdiff |
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
* 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 |