Re: Multi-ancestor read-tree notes
- From
- Darrin Thompson <darrint@progeny.com>
- Date
- Sep 8, 2005, 21:54 UTC
- Message-ID
- <1126216495.3984.4.camel@localhost.localdomain>
- In-Reply-To
- <Pine.LNX.4.63.0509081727560.23242@iabervon.org>
On Thu, 2005-09-08 at 17:39 -0400, Daniel Barkalow wrote:
> I assume that what you want is something to include everything from two > commits, which would give conflicts if a name is reused? >
Yes.
-- Darrin