diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2022-11-25 17:37:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-27 01:26:10 (GMT) |
| commit | 42db324c0f71be44c7e524623d2f516b26f1f736 (patch) | |
| tree | 964794febd799ef3b0816f80f705de1615cd5cac /merge-recursive.c | |
| parent | e7e5c6f715b2de7bea0d39c7d2ba887335b40aa0 (diff) | |
| download | git-42db324c0f71be44c7e524623d2f516b26f1f736.zip git-42db324c0f71be44c7e524623d2f516b26f1f736.tar.gz git-42db324c0f71be44c7e524623d2f516b26f1f736.tar.bz2 | |
merge-recursive: fix variable typo in error message
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -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 4ddd3ad..2fd0aa9 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, " |