git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] builtin-merge: fix a typo in an error message
@ 2009-04-13 18:10 Allan Caffee
  2009-04-13 21:41 ` Allan Caffee
  2009-04-13 23:12 ` Miklos Vajna
  0 siblings, 2 replies; 5+ messages in thread
From: Allan Caffee @ 2009-04-13 18:10 UTC (permalink / raw)
  To: git


Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
---
 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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2009-04-27 16:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-13 18:10 [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
2009-04-13 21:41 ` Allan Caffee
2009-04-13 23:12 ` Miklos Vajna
2009-04-27 15:41   ` Allan Caffee
2009-04-27 16:37     ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).