git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2025-12-15 12:58:18 -06:00
Code Issues Packages Projects Releases 335 Wiki Activity

merge-recursive: fix variable typo in error message

Browse Source 
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kyle Meyer 2022-11-25 12:37:45 -05:00 committed by Junio C Hamano
parent e7e5c6f715
commit 42db324c0f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -2100,7 +2100,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,
if (!new_path) { if (!new_path) {
/* This should only happen when entry->non_unique_new_dir set */ /* This should only happen when entry->non_unique_new_dir set */
if (!entry->non_unique_new_dir) 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): " output(opt, 1, _("CONFLICT (directory rename split): "
"Unclear where to place %s because directory " "Unclear where to place %s because directory "
"%s was renamed to multiple other directories, " "%s was renamed to multiple other directories, "