merge-recursive: fix variable typo in error message
PATCH 1/1 merge-recursive: fix variable typo in error message
Signed-off-by Kyle Meyer <[email protected]>
---
Spotted when I was trying to grep for "unique" and entered the same typo.
merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
merge-recursive.c +1 -1
@@ -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, "
base-commit: e7e5c6f715b2de7bea0d39c7d2ba887335b40aa0
Signature · 1 line
2.38.1