git-resolve-script(1) ===================== v0.99.4, Aug 2005 NAME ---- git-resolve-script - Script used to merge two trees SYNOPSIS -------- 'git-resolve-script' DESCRIPTION ----------- This script is used by Linus to merge two trees. Author ------ Written by Linus Torvalds and Dan Holmsand . Documentation -------------- Documentation by David Greaves, Junio C Hamano and the git-list . GIT --- Part of the link:git.html[git] suite