[PATCH] builtin-merge: fix a typo in an error message
From: Allan Caffee <hidden>
Date: 2016-06-15 22:46:36
Subsystem:
the rest · Maintainer:
Linus Torvalds
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