patch

Support has been added for diff3-style merges and for most features of the "diff --git" format, including renames and copies, permission changes, and symlink diffs, but not including binary diffs. Filenames can now be double-quoted as C string literals. Normal patches are no longer applied to symlinks (this behavior can be reverted with the new "--follow-symlinks" option). Timestamps with timezones are now honored correctly. Messages have been improved. Behavior and handling in several scenarios has been improved. Various minor bugs have been fixed.

The "check" makefile target was added. The --merge option was added. Reject files now can be used as regular patches. The original version of a file that is patched more than once is backed up, and at most only one reject file is made. The -r option now works correctly. Rejected hunks come out in unified diff format if the input patch was of that format. Various bugs were fixed.