a6eea67 Checkout the correct branch before trying to merge things

Authored and Committed by pingou 9 years ago
    Checkout the correct branch before trying to merge things
    
        
file modified
+16 -0