Skip to content

Commit

Permalink
builtin-merge: fix a typo in an error message
Browse files Browse the repository at this point in the history
Signed-off-by: Allan Caffee <[email protected]>
Acked-by: Miklos Vajna <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
allancaffee authored and gitster committed Apr 27, 2009
1 parent c231822 commit 345f6e2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion builtin-merge.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit 345f6e2

Please sign in to comment.