-
POTTIER Francois authored
The end-of-stream conflicts are now printed at each state, instead of at the end of the file. They are now printed before conflict resolution is performed (thus better conforming to what the manual says) whereas they used to be printed afterwards.
163855af