694168 Add documentation about the `Activate always merge` setting

Authored and Committed by Pierre-Yves Chibon 8 years ago
    Add documentation about the `Activate always merge` setting
    
        
file modified
+20 -0