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

Authored and Committed by pingou 7 years ago
    Move checking the merge status into its own function and some style fixes