Andrew's git / gitweb.git / Documentation/git-merge-one-file.txt
?
Documentation / git-merge-one-file.txton commit config.txt,diff-options.txt: porcelain vs. plumbing for color.diff (6999c54)
   1git-merge-one-file(1)
   2=====================
   3
   4NAME
   5----
   6git-merge-one-file - The standard helper program to use with git-merge-index
   7
   8
   9SYNOPSIS
  10--------
  11'git merge-one-file'
  12
  13DESCRIPTION
  14-----------
  15This is the standard helper program to use with 'git merge-index'
  16to resolve a merge after the trivial merge done with 'git read-tree -m'.
  17
  18GIT
  19---
  20Part of the linkgit:git[1] suite