зеркало из https://github.com/microsoft/git.git
Merge branch 'ar/merge-one-file-diag' into maint
* ar/merge-one-file-diag: Clarify kind of conflict in merge-one-file helper
This commit is contained in:
Junio C Hamano
Коммит
e82f625416