Re: Three-way merge with the index as one way

From: Junio C Hamano <junkio@cox.net>
Date: Nov 4, 2005, 19:05 UTC
Message-ID: <7vslucutbs.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <20051103003423.GH1431@pasky.or.cz>

Petr Baudis <pasky@suse.cz> writes:

> I wanted to make tree_timewarp do three-way merge, but didn't figure a
> good way to do it. First, what do I want - a two-way merge between two
> trees, which will however respect (not die on) local changes in the
> working tree.

I remember that we used to have --emu23 flag to read-tree. It was yanked out when we did multi-merge-base conversion, because nobody was using it, but I wonder if that is close to what you are looking for.

$ git whatchanged -S--emu23 read-tree.c

tells me that 32192e6622d78347448cfc0572827d6e64e0de28 commit completed it and ee6566e8d70da682ac4926dd8a67ac821b2c1743 commit removed it.