зеркало из https://github.com/microsoft/git.git
21 строка
379 B
Plaintext
21 строка
379 B
Plaintext
git-merge-one-file(1)
|
|
=====================
|
|
|
|
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'.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|