Skip to content

Commit 345f6e2

Browse files
allancaffeegitster
authored andcommitted
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>
1 parent c231822 commit 345f6e2

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

builtin-merge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ static int suggest_conflicts(void)
703703

704704
fp = fopen(git_path("MERGE_MSG"), "a");
705705
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"));
707707
fprintf(fp, "\nConflicts:\n");
708708
for (pos = 0; pos < active_nr; pos++) {
709709
struct cache_entry *ce = active_cache[pos];

0 commit comments

Comments
 (0)