git-merge-one-file-script - The standard helper program to use with "git-merge-cache"
git-merge-one-file-script
This is the standard helper program to use with "git-merge-cache" to resolve a merge after the trivial merge done with "git-read-tree -m".
Written by Linus Torvalds <torvalds@osdl.org>
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
Part of the git(7) suite