9559110 support merge_mode field

Authored and Committed by mikem 7 years ago
    support merge_mode field
    
        
file modified
+41 -14
file modified
+2 -0