f2978a9 Improve the merge logic to handle third-party repos more sanely

Authored and Committed by sgallagh 4 years ago
    Improve the merge logic to handle third-party repos more sanely
    
    Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
    
        
file modified
+5 -6