v2.6.1
Move all source and header files into src/
* src/patch.c (longopts, get_some_switches): Add an optional argument to the --merge option to choose the output formats for conflicts. * patch.man: Document the new optional argument of --merge. * src/merge.c (merge_hunk): Implement diff3-style conflicts. * src/common.h (conflict_style): This global variable determines the output format for conflicts. * tests/merge: Add test cases for the diff3 output format.
Copyright notice updates
Fix the "patch would create" fix from 2009-03-28
patch -Z not working if timestamp contains seconds > 59.5
* src/pch.c: When the input files to diff have CRLF line endings, the '<' and '>' lines of normal-style diffs will have CRLF endings even when the patch itself has not been CRLF mangled. Do not assume a mangled patch in this case. * tests/crlf-handling: Update test case to cover this case.
Preserve timestamps in reject files
When copying files, use full_write() from gnulib instead of write()
* src/version.c (copyright_string): Add year 2009.