.gitattributes: CR at the end of the line is an error

diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index a7883690d74cb1bcef7b20f27ebbea6f6c5dcc53..fae1482ba91937232f427a3f5dd03c587c3fba57 100644 (file)
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -363,6 +363,7 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
        argc = parse_options(argc, argv, options, fmt_merge_msg_usage, 0);
        if (argc > 0)
                usage_with_options(fmt_merge_msg_usage, options);
+       inpath = parse_options_fix_filename(prefix, inpath);
 
        if (inpath && strcmp(inpath, "-")) {
                in = fopen(inpath, "r");