fb36e7 Add unit-tests when merge_pull_request fails to due a conflict

Authored and Committed by Pierre-Yves Chibon 9 years ago
    Add unit-tests when merge_pull_request fails to due a conflict