48eff69 support merge_mode field

2 files Authored by mikem 5 years ago, Committed by tkopecek 5 years ago,
    support merge_mode field
    
        
file modified
+41 -14
file modified
+2 -0