git-merge-one-file - The standard helper program to use with git-merge-index
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.
© 2005–2017 Linus Torvalds and others
Licensed under the GNU General Public License version 2.