Only return :success from git_client merge if the exit_code is zero.  If it's non-zero and not a conflict raise.