Content - 04e803d5d3362c97e92efc22bdec4fe526946c6f - 7ac00bf/Documentation/git-merge-one-file.txt

visit type:

Tip revision: be3fa9125e708348c7baf04ebe9507a72a9d1800 authored by Junio C Hamano on 31 October 2011, 02:14:24 UTC
Git 1.7.8-rc0

Tip revision: be3fa91

git-merge-one-file.txt

git-merge-one-file(1)
=====================

NAME
----
git-merge-one-file - The standard helper program to use with git-merge-index


SYNOPSIS
--------
[verse]
'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 linkgit:git[1] suite

Browse the archive

https://github.com/git/git