git-merge-one-file

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.7.4                         12/09/2019              GIT-MERGE-ONE-FIL(1)
Man Pages Copyright Respective Owners. Site Copyright (C) 1994 - 2020 Hurricane Electric. All Rights Reserved.