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

DESCRIPTION

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

GIT

17       Part of the git(1) suite
18
19
20
21Git 2.36.1                        2022-05-05              GIT-MERGE-ONE-FIL(1)