Re: [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution

From: Martin Langhoff (CatalystIT) <martin@catalyst.net.nz>
Date: Aug 4, 2006, 00:37 UTC
Message-ID: <44D296D8.4030200@catalyst.net.nz>
In-Reply-To: <7v64h9pdx4.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano wrote:

> We can have unmerged index without MERGE_HEAD (for example,
> think "rebase --merge" or "am -3"); drop check for that and
> instead check for stage 2 ("ours") for the path.

Reading Documentation/git-read-tree.txt it seems to mean that stage 1 is merge base, 1 is ours and 2 is the branch being merged in.

I am confused...

Quote:

> When performing a merge of another
> branch into the current branch, we use the common ancestor tree
> as <tree1>, the current branch head as <tree2>, and the other
> branch head as <tree3>.

-- 
-----------------------------------------------------------------------
Martin @ Catalyst .Net .NZ  Ltd, PO Box 11-053, Manners St,  Wellington
WEB: http://catalyst.net.nz/           PHYS: Level 2, 150-154 Willis St
OFFICE: +64(4)916-7224                              MOB: +64(21)364-017
       Make things as simple as possible, but no simpler - Einstein
-----------------------------------------------------------------------