172a05 Fix merging pull-request when there is a merge commit

Authored and Committed by Pierre-Yves Chibon 10 years ago
    Fix merging pull-request when there is a merge commit
    
        
file modified
+3 -2