From: Linus Torvalds <torvalds@osdl.org>
Date: Sat, 18 Jun 2005 00:26:02 GMT
Subject: Re: Handling merge conflicts a bit more gracefully..
Message-ID: <Pine.LNX.4.58.0506171725150.2268@ppc970.osdl.org>
In-Reply-To: <E1DjQza-0001wP-00@gondolin.me.apana.org.au>



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