mirror of
https://github.com/git/git.git
synced 2024-09-25 22:41:30 +02:00
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
This commit is contained in:
commit
b3db182886
@ -651,6 +651,11 @@ static void path_msg(struct merge_options *opt,
|
|||||||
dest = (opt->record_conflict_msgs_as_headers ? &tmp : sb);
|
dest = (opt->record_conflict_msgs_as_headers ? &tmp : sb);
|
||||||
|
|
||||||
va_start(ap, fmt);
|
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);
|
strbuf_vaddf(dest, fmt, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user