[PATCH] builtin-merge: fix a typo in an error message

Signed-off-by: Allan Caffee <redacted>
---
 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

On Mon, Apr 13, 2009 at 2:10 PM, Allan Caffee [off-list ref] wrote:

On second thought this commit message should probably read something more like:

builtin-merge.c: correct error message for failed open

Since the original message is actually wrong.

On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee [off-list ref] wrote:

-		die("Could open %s for writing", git_path("MERGE_MSG"));
+		die("Could not open %s for writing", git_path("MERGE_MSG"));

Acked-by: Miklos Vajna <redacted>

Thanks.

PS: Please use 'unset followup_to' when sending messages to the git
list, see
http://thread.gmane.org/gmane.comp.version-control.git/83140/focus=83234.

Hello Junio,

On Tue, 14 Apr 2009, Miklos Vajna wrote:

On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee [off-list ref] wrote:

quoted

-		die("Could open %s for writing", git_path("MERGE_MSG"));
+		die("Could not open %s for writing", git_path("MERGE_MSG"));

Acked-by: Miklos Vajna <redacted>

Is this one ready for maint?  (The issue dates back to 1c7b76be.)

Allan Caffee [off-list ref] writes:

Hello Junio,

On Tue, 14 Apr 2009, Miklos Vajna wrote:

quoted

On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee [off-list ref] wrote:

quoted

-		die("Could open %s for writing", git_path("MERGE_MSG"));
+		die("Could not open %s for writing", git_path("MERGE_MSG"));

Acked-by: Miklos Vajna <redacted>

Is this one ready for maint?  (The issue dates back to 1c7b76be.)

Indeed it is; I do not know how this one slipped.

Thanks.