From: Petr Baudis Date: Sun, 08 May 2005 17:51:56 GMT Subject: Re: [PATCH Cogito] Make use of external editor work like CVS Message-ID: <20050508175156.GA9495@pasky.ji.cz> In-Reply-To: <1115574035.9031.145.camel@pegasus> Dear diary, on Sun, May 08, 2005 at 07:40:34PM CEST, I got a letter where Marcel Holtmann told me that... > > > Sometime you don't have any other choice, because diff is not perfect. > > > Do you wanna apply that patch or should I change the mktemp templates > > > first? > > > > It looks like it'll be most painless when I just reinvent parts of your > > patch here locally and you can send me patches on top of that. > > it is your choice. I can change that if you like. My latest version > should apply cleanly against your current tree. I've pushed my changes, please have a look at them. I think I've got everything important, but I might've forgot something. > If you want the extra newline(s) then it is a good idea to add something > that strips heading and trailing empty lines from the final commit > message, because otherwise it will be ugly if you don't enter extra text > for the merge. Isn't that what I initially suggested? :-) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor