Date: Thu, 14 Jun 2007 16:33:53 +0800 From: LI Xin <delphij@delphij.net> To: Chuck Swiger <cswiger@mac.com> Cc: FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: RFC: diff(1) update Message-ID: <4670FD71.4070108@delphij.net> In-Reply-To: <96AE8CCB-5E8B-47EF-AE9A-8CA38AB9334E@mac.com> References: <466FB481.3090503@delphij.net> <96AE8CCB-5E8B-47EF-AE9A-8CA38AB9334E@mac.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] Hi, Chuck, Chuck Swiger wrote: > Paul Eggert, the diffutils maintainer, has recently adopted a patch for > sdiff which allows using "1" and "2" in addition to "l" and "r", which > is exceptionally useful when people are running mergemaster. Also, dmalone@ has pointed out that to me. Sounds reasonable and I will take it into account in the import. > v2.8.6 also includes a fix for invoking an editor in sdiff mode: [snip] Do you think it's more sensible to just import 2.8.6 or 2.8.7 instead? Or should I pull out the two changesets? Cheers, -- Xin LI <delphij@delphij.net> http://www.delphij.net/ FreeBSD - The Power to Serve! [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (Darwin) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGcP1yOfuToMruuMARCqhQAJ0ebFSR5tVZCWwmdHZGQBXSbnYGuACdFaCt aVrldWfwTuMWotf1ozf0z5Y= =uFf5 -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4670FD71.4070108>