* src/conflicts.c (conflict_report): New function.
authorAkim Demaille <akim@epita.fr>
Mon, 2 Oct 2000 08:08:52 +0000 (08:08 +0000)
committerAkim Demaille <akim@epita.fr>
Mon, 2 Oct 2000 08:08:52 +0000 (08:08 +0000)
commit0619caf0b1e1f05b710bac41bcefa6d12206f285
treeae05ee00e9cb5c42dc3df09d5c7488b1dd297ec8
parent3519ec76a359c6236e4f043982c6a6433b04eac5
* src/conflicts.c (conflict_report): New function.
(conflict_log, verbose_conflict_log): Replace with...
(print_conflicts): this function.
Adjust dependencies.
* src/conflicts.h: New file.
Propagate its inclusion.
ChangeLog
src/Makefile.am
src/conflicts.c
src/conflicts.h [new file with mode: 0644]
src/output.c
src/print.c