59b3a3 Implement non-fast-forward merge

Authored and Committed by Pierre-Yves Chibon 10 years ago
    Implement non-fast-forward merge
    
    This means, merge the two branch and create a commit having 2 parents.
    
        
file modified
+15 -5