git-resolve-script - Script used to merge two trees
git-resolve-script
This script is used by Linus to merge two trees.
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