diff options
| -rw-r--r-- | merge-ort.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index d85b1cd99e..55decb2587 100644 --- 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); |