X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-merge.c;h=0b58e5eda1f38c1560cc9dcf69be37fa5fc9886f;hb=7f5a68ad4d0e00eb2f28405946ec0f2691d7ad81;hp=6a51823a55502766bee74dfd0a3857a8330a0f75;hpb=cef5775b9f640beb51b07f8a296cfcc9b11b9744;p=git.git diff --git a/builtin-merge.c b/builtin-merge.c index 6a51823a5..0b58e5eda 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -764,7 +764,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];