Thread (4 messages) flat view 4 messages, 3 authors, 2016-06-15

Re: Handling merge conflicts a bit more gracefully..

From: Linus Torvalds <torvalds@osdl.org>
Date: 2016-06-15 22:42:00

Possibly related (same subject, not in this thread)


On Sat, 18 Jun 2005, Herbert Xu wrote:
I don't know whether this is the cleanest, but this is one way:
Oh, wow.

One thing I have to say is that I've learnt a lot more shell tricks. 

Now I'll just have to unlearn them, so that I won't have nightmares.

		Linus
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help