From: Allan Caffee Date: Mon, 13 Apr 2009 18:10:08 GMT Subject: [PATCH] builtin-merge: fix a typo in an error message Message-ID: <20090413181008.GA8273@linux.vnet> Signed-off-by: Allan Caffee --- builtin-merge.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/builtin-merge.c b/builtin-merge.c index 6a51823..0b58e5e 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]; -- 1.5.6.3