76845d2 - fix #473186 conflict timeout with coreutils

Authored and Committed by jskala 15 years ago
1 file changed. 20 lines added. 1 lines removed.
    - fix #473186 conflict timeout with coreutils
    
        
file modified
+20 -1