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>
Kyle Meyer committed
Nov 25, 2022 at 12:37 UTC
42db324c0f71be44c7e524623d2f516b26f1f736
1 file changed
+1
-1
merge-recursive.c
+1
-1
@@ -2100,7 +2100,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,
2100
if (!new_path) {
2101
/* This should only happen when entry->non_unique_new_dir set */
2102
if (!entry->non_unique_new_dir)
2103
- BUG("entry->non_unqiue_dir not set and !new_path");
2103
+ BUG("entry->non_unique_new_dir not set and !new_path");
2104
output(opt, 1, _("CONFLICT (directory rename split): "
2105
"Unclear where to place %s because directory "
2106
"%s was renamed to multiple other directories, "