From 345f6e2cb547007da48ef503f00070cdcca04975 Mon Sep 17 00:00:00 2001 From: Allan Caffee Date: Mon, 13 Apr 2009 14:10:08 -0400 Subject: builtin-merge: fix a typo in an error message Signed-off-by: Allan Caffee Acked-by: Miklos Vajna Signed-off-by: Junio C Hamano --- builtin-merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin-merge.c') diff --git a/builtin-merge.c b/builtin-merge.c index d0bf1fc1ed..370d0034ca 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -703,7 +703,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]; -- cgit v1.2.1