Re: Kim Hansen 2010-09-18 <[email protected]> > k...@raph:~$ patch -m > patch: invalid option -- 'm' > patch: Try `patch --help' for more information. > k...@raph:~$ patch --help | grep -- --merge > -m --merge Merge using conflict markers instead of creating reject files.
--merge works, -m does not. The ChangeLog says: 2009-07-19 Andreas Gruenbacher <[email protected]> * src/partime.c: The -m option hasn't been officially allocated yet. Use only the long form for now (--merge). The documentation should have been updated to, but wasn't. I've reenabled -m in sid now. (I'm yet unsure if that's a change that should I request a release unblock for.) Thanks for spotting. Christoph -- [email protected] | http://www.df7cb.de/
signature.asc
Description: Digital signature
