RFC: diff(1) update

LI Xin delphij at delphij.net
Thu Jun 14 08:34:14 UTC 2007

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:

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?

Xin LI <delphij at delphij.net>	http://www.delphij.net/
FreeBSD - The Power to Serve!

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : http://lists.freebsd.org/pipermail/freebsd-current/attachments/20070614/c6208809/signature.pgp

More information about the freebsd-current mailing list