git-merge-one-file(category31-clients.html) - phpMan

GIT-MERGE-ONE-FILE(1)             Git Manual             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 git(1) suite
Git 2.43.5                        05/31/2024             GIT-MERGE-ONE-FILE(1)