diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-11-29 10:41:06 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-29 10:41:06 +0900 |
| commit | 8350c3493032d4fa1ae32bd79fd83bf3abbaf339 (patch) | |
| tree | ca8e862383f97824cee94f3876031fb1b15f10bc | |
| parent | 515ffabccf75c221cbb6bcef7eb8f89f6c832da9 (diff) | |
| parent | 42db324c0f71be44c7e524623d2f516b26f1f736 (diff) | |
Merge branch 'km/merge-recursive-typofix'
Fix an old typo in an error message.
* km/merge-recursive-typofix:
merge-recursive: fix variable typo in error message
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 4ddd3adea0..2fd0aa9687 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2100,7 +2100,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt, if (!new_path) { /* This should only happen when entry->non_unique_new_dir set */ if (!entry->non_unique_new_dir) - BUG("entry->non_unqiue_dir not set and !new_path"); + BUG("entry->non_unique_new_dir not set and !new_path"); output(opt, 1, _("CONFLICT (directory rename split): " "Unclear where to place %s because directory " "%s was renamed to multiple other directories, " |