Merge branch 'en/ort-inner-merge-conflict-report' into jch

* en/ort-inner-merge-conflict-report: merge-ort: make informational messages from recursive merges clearer
git · Feb 17, 2022 · 9743003 · 9743003
2 parents 4ba532b + 4a3d86e
commit 9743003
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/merge-ort.c b/merge-ort.c
@@ -651,6 +651,11 @@ static void path_msg(struct merge_options *opt,
 	dest = (opt->record_conflict_msgs_as_headers ? &tmp : sb);
 
 	va_start(ap, fmt);
+	if (opt->priv->call_depth) {
+		strbuf_addchars(dest, ' ', 2);
+		strbuf_addstr(dest, "From inner merge:");
+		strbuf_addchars(dest, ' ', opt->priv->call_depth * 2);
+	}
 	strbuf_vaddf(dest, fmt, ap);
 	va_end(ap);