SuSE 11.3 - man page for git-merge-tree (suse section 1)

GIT-MERGE-TREE(1)			    Git Manual				GIT-MERGE-TREE(1)

NAME
       git-merge-tree - Show three-way merge without touching index

SYNOPSIS
       git merge-tree <base-tree> <branch1> <branch2>

DESCRIPTION
       Reads three treeish, and output trivial merge results and conflicting stages to the
       standard output. This is similar to what three-way git read-tree -m does, but instead of
       storing the results in the index, the command outputs the entries to the standard output.

       This is meant to be used by higher level scripts to compute merge results outside of the
       index, and stuff the results back into the index. For this reason, the output from the
       command omits entries that match the <branch1> tree.

AUTHOR
       Written by Linus Torvalds <torvalds@osdl.org[1]>

DOCUMENTATION
       Documentation by Junio C Hamano and the git-list <git@vger.kernel.org[2]>.

GIT
       Part of the git(1) suite

NOTES
	1. torvalds@osdl.org
	   mailto:torvalds@osdl.org

	2. git@vger.kernel.org
	   mailto:git@vger.kernel.org

Git 1.7.1				    07/05/2010				GIT-MERGE-TREE(1)