Merge branch 'js/emu-write-epipe-on-windows'

diff --git a/fast-import.c b/fast-import.c
index e3b421d5149bc3a2ad58ca8df98fdf2c924ed7c0..3c65edb5c44e1fa57beef851d56a9674a5be1b72 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1824,7 +1824,7 @@ static void dump_marks(void)
 
        dump_marks_helper(f, 0, marks);
        if (commit_lock_file(&mark_lock)) {
-               failure |= error("Unable to commit marks file %s: %s",
+               failure |= error("Unable to write file %s: %s",
                        export_marks_file, strerror(errno));
                return;
        }