diff options
Diffstat (limited to 'll-merge.c')
| -rw-r--r-- | ll-merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ll-merge.c b/ll-merge.c index bf83290793..3407f8c5d7 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -111,6 +111,7 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused, xmp.style = git_xmerge_style; if (marker_size > 0) xmp.marker_size = marker_size; + xmp.crlf = (core_eol == EOL_CRLF); xmp.ancestor = orig_name; xmp.file1 = name1; xmp.file2 = name2; |