d5c458 Move checking the merge status into its own function and some style fixes

Authored and Committed by Pierre-Yves Chibon 7 years ago
    Move checking the merge status into its own function and some style fixes