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 /diff.c | |
| parent | Merge branch 'rs/pcre-invalid-utf8-fix-fix' (diff) | |
| parent | merge-ort: make informational messages from recursive merges clearer (diff) | |
| download | git-b3db182886fccb2220b8aa0a2389cf1c2e12aadb.tar.gz git-b3db182886fccb2220b8aa0a2389cf1c2e12aadb.zip | |
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
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions