Commit 345f6e2c authored by Allan Caffee's avatar Allan Caffee Committed by Junio C Hamano

builtin-merge: fix a typo in an error message

Signed-off-by: default avatarAllan Caffee <[email protected]>
Acked-by: default avatarMiklos Vajna <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent c2318228
......@@ -703,7 +703,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];
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment