f9fd15 Add some more tests on the behavior of the Merge keyword in commits

Authored and Committed by Pierre-Yves Chibon 8 years ago
    Add some more tests on the behavior of the Merge keyword in commits
    
    Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>