diff options
Diffstat (limited to 'builtin/merge-file.c')
| -rw-r--r-- | builtin/merge-file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 55447053f2..c534c91f44 100644 --- a/builtin/merge-file.c +++ b/builtin/merge-file.c @@ -81,6 +81,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix) argv[i]); } + xmp.crlf = (core_eol == EOL_CRLF); xmp.ancestor = names[1]; xmp.file1 = names[0]; xmp.file2 = names[2]; |