0973ae
Do not send a notification upon merge conflicts Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr></pingou@pingoured.fr>