стандартная вспомогательная программа для использования с git-merge-index (The standard helper program to use with git-merge-index)
Имя (Name)
git-merge-one-file - The standard helper program to use with
git-merge-index
Синопсис (Synopsis)
git merge-one-file
Описание (Description)
This is the standard helper program to use with git merge-index
to resolve a merge after the trivial merge done with git
read-tree -m.
