Re: Multi-ancestor read-tree notes
From: Darrin Thompson <hidden>
Date: 2016-06-15 22:42:05
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