* [PATCH] merge-recursive: fix variable typo in error message
@ 2022-11-25 17:37 Kyle Meyer
0 siblings, 0 replies; only message in thread
From: Kyle Meyer @ 2022-11-25 17:37 UTC (permalink / raw)
To: git; +Cc: Elijah Newren
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
---
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(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 4ddd3adea0..2fd0aa9687 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, "
base-commit: e7e5c6f715b2de7bea0d39c7d2ba887335b40aa0
--
2.38.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2022-11-25 17:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-25 17:37 [PATCH] merge-recursive: fix variable typo in error message Kyle Meyer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.