SYNOPSIS

git-resolve-script

DESCRIPTION

This script is used by Linus to merge two trees.

Author

Written by Linus Torvalds <torvalds@osdl.org>

Documentation

Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.

GIT

Part of the git suite