git-merge-one-file1
The standard helper program to use with git-merge-index
Usage
git merge-one-file
Overview
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
Releases
11 releases since Debian 4.0 (Etch); the text changed 10 times.