1 .\"Generated by db2man.xsl. Don't modify this, modify the source.
10 .de Sp \" Vertical space (when we can't use .PP)
16 .ie \\n(.$>=3 .ne \\$3
20 .TH "GIT-MERGE-TREE" 1 "" "" ""
22 git-merge-tree \- Show three-way merge without touching index
26 \fIgit\-merge\-tree\fR <base\-tree> <branch1> <branch2>
31 Reads three treeish, and output trivial merge results and conflicting stages to the standard output\&. This is similar to what three\-way read\-tree \-m does, but instead of storing the results in the index, the command outputs the entries to the standard output\&.
34 This is meant to be used by higher level scripts to compute merge results outside index, and stuff the results back into the index\&. For this reason, the output from the command omits entries that match <branch1> tree\&.
39 Written by Linus Torvalds <torvalds@osdl\&.org>
44 Documentation by Junio C Hamano and the git\-list <git@vger\&.kernel\&.org>\&.
49 Part of the \fBgit\fR(7) suite