1git-resolve-script(1) 2===================== 3v0.99.4, Aug 2005 4 5NAME 6---- 7git-resolve-script - Script used to merge two trees 8 9 10SYNOPSIS 11-------- 12'git-resolve-script' 13 14DESCRIPTION 15----------- 16This script is used by Linus to merge two trees. 17 18 19Author 20------ 21Written by Linus Torvalds <torvalds@osdl.org> and 22Dan Holmsand <holmsand@gmail.com>. 23 24Documentation 25-------------- 26Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. 27 28GIT 29--- 30Part of the link:git.html[git] suite 31