LT == Linus Torvalds [EMAIL PROTECTED] writes:
LT Damn, my cunning plan is some good stuff.
I really like this a lot. It is *so* *simple*, clear, flexible
and an example of elegance. This is one of the things I would
happily say Sheesh! Why didn't *I* think of *THAT*
first!!!
On Sat, 16 Apr 2005, Junio C Hamano wrote:
LT NOTE NOTE NOTE! I could make read-tree do some of these nontrivial
LT merges, but I ended up deciding that only the matches in all three
LT states thing collapses by default.
* Understood and agreed.
Having slept on it, I think I'll merge
On Sat, 16 Apr 2005, Linus Torvalds wrote:
Having slept on it, I think I'll merge all the trivial cases that don't
involve a file going away or being added. Ie if the file is in all three
trees, but it's the same in two of them, we know what to do.
Junio, I pushed this out, along with
On Fri, 15 Apr 2005, Junio C Hamano wrote:
I'd take the hint, but I would say the current Perl version
would be far more usable than the C version I would come up with
by the end of this weekend because:
Actually, it turns out that I have a cunning plan.
I'm full of cunning plans, in
4 matches
Mail list logo
