{"thread":{"id":"58856","subject":"[PATCH] merge-recursive: fix variable typo in error message","startedAt":"2022-11-25T17:38:05Z","lastAt":"2022-11-25T17:38:05Z","messageCount":1,"participants":["Kyle Meyer"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"468004","messageId":"20221125173745.738643-1-kyle@kyleam.com","threadId":"58856","inReplyTo":null,"subject":"[PATCH] merge-recursive: fix variable typo in error message","fromName":"Kyle Meyer","fromEmail":"kyle@kyleam.com","sentAt":"2022-11-25T17:37:45Z","receivedAt":"2022-11-25T17:38:05Z","isPatch":true,"sender":{"key":"kyle@kyleam.com","avatar":"https://avatars.githubusercontent.com/u/1297788?v=4"},"body":"Signed-off-by: Kyle Meyer <kyle@kyleam.com>\n---\n\n  Spotted when I was trying to grep for \"unique\" and entered the same\n  typo.\n\n merge-recursive.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 4ddd3adea0..2fd0aa9687 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -2100,7 +2100,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,\n \tif (!new_path) {\n \t\t/* This should only happen when entry->non_unique_new_dir set */\n \t\tif (!entry->non_unique_new_dir)\n-\t\t\tBUG(\"entry->non_unqiue_dir not set and !new_path\");\n+\t\t\tBUG(\"entry->non_unique_new_dir not set and !new_path\");\n \t\toutput(opt, 1, _(\"CONFLICT (directory rename split): \"\n \t\t\t       \"Unclear where to place %s because directory \"\n \t\t\t       \"%s was renamed to multiple other directories, \"\n\nbase-commit: e7e5c6f715b2de7bea0d39c7d2ba887335b40aa0\n-- \n2.38.1\n\n"}]}