e52007 Patch to revert to file conflicts behaviour

Authored and Committed by Paul Nasrat 20 years ago
    Patch to revert to file conflicts behaviour