diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-02-25 15:47:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-25 15:47:38 -0800 |
| commit | b3db182886fccb2220b8aa0a2389cf1c2e12aadb (patch) | |
| tree | c0e1ee101f59b30851f11fac058e2587f6482f69 | |
| parent | Merge branch 'rs/pcre-invalid-utf8-fix-fix' (diff) | |
| parent | merge-ort: make informational messages from recursive merges clearer (diff) | |
| download | tgif-b3db182886fccb2220b8aa0a2389cf1c2e12aadb.tar.xz | |
Merge branch 'en/ort-inner-merge-conflict-report'
Messages "ort" merge backend prepares while dealing with conflicted
paths were unnecessarily confusing since it did not differentiate
inner merges and outer merges.
* en/ort-inner-merge-conflict-report:
merge-ort: make informational messages from recursive merges clearer
| -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); |