Andreas Gruenbacher 8cc8b7061c * 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.

2009-12-29 17:03:14 +01:00

..

bestmatch.h

Move all source and header files into src/

2009-04-05 08:12:05 +02:00

common.h

* src/patch.c (longopts, get_some_switches): Add an optional argument

2009-12-29 17:03:14 +01:00

diffseq.h

Copyright notice updates

2009-04-05 21:12:30 +02:00

inp.c

Fix the "patch would create" fix from 2009-03-28

2009-04-06 05:47:52 +02:00

inp.h

Copyright notice updates

2009-04-05 21:12:30 +02:00

maketime.c

Move all source and header files into src/

2009-04-05 08:12:05 +02:00

maketime.h

Move all source and header files into src/

2009-04-05 08:12:05 +02:00

merge.c

* src/patch.c (longopts, get_some_switches): Add an optional argument

2009-12-29 17:03:14 +01:00

partime.c

patch -Z not working if timestamp contains seconds > 59.5

2009-04-06 17:57:50 +02:00

partime.h

Move all source and header files into src/

2009-04-05 08:12:05 +02:00

patch.c

* src/patch.c (longopts, get_some_switches): Add an optional argument

2009-12-29 17:03:14 +01:00

pch.c

* src/pch.c: When the input files to diff have CRLF line endings, the

2009-12-28 15:14:20 +01:00

pch.h

Preserve timestamps in reject files

2009-04-07 22:03:49 +02:00

quotesys.c

Copyright notice updates

2009-04-05 21:12:30 +02:00

quotesys.h

Move all source and header files into src/

2009-04-05 08:12:05 +02:00

util.c

When copying files, use full_write() from gnulib instead of write()

2009-07-19 16:37:11 +02:00

util.h

Preserve timestamps in reject files

2009-04-07 22:03:49 +02:00

version.c

* src/version.c (copyright_string): Add year 2009.

2009-12-22 20:30:22 +01:00

version.h

Move all source and header files into src/

2009-04-05 08:12:05 +02:00