From: Allan Caffee <allan.caffee@gmail.com>
Date: Mon, 13 Apr 2009 18:10:08 +0000 (-0400)
Subject: builtin-merge: fix a typo in an error message
X-Git-Tag: v1.6.1.4~5^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=345f6e2cb547007da48ef503f00070cdcca04975;p=git.git

builtin-merge: fix a typo in an error message

Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
Acked-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-merge.c b/builtin-merge.c
index d0bf1fc1e..370d0034c 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];