Merge branch 'maint-1.6.0' into maint-1.6.1

[git.git] / builtin-merge.c

diff --git a/builtin-merge.c b/builtin-merge.c
index cf869751b41c256363bf5f0c465e46684e2920b8..2179e0686dda496fb6ec83bd03fc7135f2e6e040 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -785,7 +785,7 @@ static int suggest_conflicts(void)
 
        fp = fopen(git_path("MERGE_MSG"), "a");
        if (!fp)
-               die("Could open %s for writing", git_path("MERGE_MSG"));
+               die("Could not open %s for writing", git_path("MERGE_MSG"));
        fprintf(fp, "\nConflicts:\n");
        for (pos = 0; pos < active_nr; pos++) {
                struct cache_entry *ce = active_cache[pos];