GIT-MERGE-ONE-FIL(category30-tips-tricks-fragen.html) - phpMan

git-merge-one-file (1) - The standard helper program to use with git-merge-index