summaryrefslogtreecommitdiff
path: root/merge-file.h
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-05-23 16:31:05 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-24 09:08:17 -0700
commit0508fe533dfe1b890f6a2d31ca42ba25466e8ff5 (patch)
tree748d9bcd266ca173d6269a07c95343ccc8cf2a76 /merge-file.h
parentrefactor get_textconv to not require diff_filespec (diff)
downloadtgif-0508fe533dfe1b890f6a2d31ca42ba25466e8ff5.tar.xz
combine-diff: respect textconv attributes
When doing a combined diff, we did not respect textconv attributes at all. This generally lead to us printing "Binary files differ" when we could show a combined diff of the converted text. This patch converts file contents according to textconv attributes. The implementation is slightly ugly; because the textconv code is tightly linked with the diff_filespec code, we temporarily create a diff_filespec during conversion. In practice, though, this should not create a performance problem. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions