| commit | b3db182886fccb2220b8aa0a2389cf1c2e12aadb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Feb 2022 23:47:38 +0000 (25 15:47 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Feb 2022 23:47:38 +0000 (25 15:47 -0800) | ||
| tree | c0e1ee101f59b30851f11fac058e2587f6482f69 | treesnapshot (tar.gz zip) |
| parent | 5c4f3804a73933504e76b6ebdd946a2db3b1d214 | commitdiff |
| parent | 4a3d86e1bb67bea71a481b4cb1860295b97d044a | commitdiff |
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
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