1git-merge-tree(1) 2================= 3 4NAME 5---- 6git-merge-tree - Show three-way merge without touching index 7 8 9SYNOPSIS 10-------- 11'git merge-tree' <base-tree> <branch1> <branch2> 12 13DESCRIPTION 14----------- 15Reads three treeish, and output trivial merge results and 16conflicting stages to the standard output. This is similar to 17what three-way 'git read-tree -m' does, but instead of storing the 18results in the index, the command outputs the entries to the 19standard output. 20 21This is meant to be used by higher level scripts to compute 22merge results outside of the index, and stuff the results back into the 23index. For this reason, the output from the command omits 24entries that match the <branch1> tree. 25 26Author 27------ 28Written by Linus Torvalds <torvalds@osdl.org> 29 30Documentation 31-------------- 32Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. 33 34GIT 35--- 36Part of the linkgit:git[1] suite