Merge branch 'jc/maint-read-tree-multi' into maint-1.6.2

diff --git a/builtin-merge.c b/builtin-merge.c
index 6d2160d0a3db1705d1372029dfa24752d453c8ec..c339380cf3a94c5c157e7b3fae082ea2321320fc 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -765,7 +765,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];