1GIT-MERGE-ONE-FIL(1)              Git Manual              GIT-MERGE-ONE-FIL(1)
2
3
4

NAME

6       git-merge-one-file - The standard helper program to use with
7       git-merge-index
8

SYNOPSIS

10       git merge-one-file
11
12

DESCRIPTION

14       This is the standard helper program to use with git merge-index to
15       resolve a merge after the trivial merge done with git read-tree -m.
16

GIT

18       Part of the git(1) suite
19
20
21
22Git 2.18.1                        05/14/2019              GIT-MERGE-ONE-FIL(1)