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>
Allan Caffee committed
Apr 13, 2009 at 14:10 UTC
345f6e2cb547007da48ef503f00070cdcca04975
1 file changed
+1
-1
builtin-merge.c
+1
-1
@@ -703,7 +703,7 @@ static int suggest_conflicts(void)
703
704
fp = fopen(git_path("MERGE_MSG"), "a");
705
if (!fp)
706
- die("Could open %s for writing", git_path("MERGE_MSG"));
706
+ die("Could not open %s for writing", git_path("MERGE_MSG"));
707
fprintf(fp, "\nConflicts:\n");
708
for (pos = 0; pos < active_nr; pos++) {
709
struct cache_entry *ce = active_cache[pos];