a19f20 Reduce code duplication

Authored and Committed by Pierre-Yves Chibon 9 years ago
    Reduce code duplication
    
    - Adjust pagure.lib.git.merge_pull_request to actually do the merge (or
      not) and if not, then it returns the state of the merge (NO_CHANGE,
      FFORWARD, CONFLICTS, MERGE)
    - Have mergeable_request_pull rely on pagure.lib.git.merge_pull_request
    
        
file modified
+12 -81
file modified
+45 -22