d5c14e Check that the merge actually did merge something and inform the user otherwise

Authored and Committed by Pierre-Yves Chibon 10 years ago
    Check that the merge actually did merge something and inform the user otherwise
    
        
file modified
+6 -1