Revision 21e9757e31d136fad0c04f3ce9da11b8b128b4f2 authored by Alex Riesen on 01 August 2007, 12:57:43 UTC, committed by Junio C Hamano on 02 August 2007, 00:58:12 UTC
It wont work for arguments with special characters (like ", : or *). It is generally not possible on Windows, so I didn't even try. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 96ffe89
git-merge-tree.txt
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 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 index, and stuff the results back into the
index. For this reason, the output from the command omits
entries that match <branch1> tree.
Author
------
Written by Linus Torvalds <torvalds@osdl.org>
Documentation
--------------
Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
GIT
---
Part of the gitlink:git[7] suite
Computing file changes ...
