xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM

diff --git a/diff.c b/diff.c
index 41ec2ced78d7f0d8fe86eea0285b76f70843a3a8..58fe7750f9ca7d63192164a3ac8da27553489d11 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1631,7 +1631,7 @@ int diff_populate_filespec(struct diff_filespec *s, int size_only)
                 * Convert from working tree format to canonical git format
                 */
                strbuf_init(&buf, 0);
-               if (convert_to_git(s->path, s->data, s->size, &buf)) {
+               if (convert_to_git(s->path, s->data, s->size, &buf, safe_crlf)) {
                        size_t size = 0;
                        munmap(s->data, s->size);
                        s->should_munmap = 0;