[PATCH] Don't output 'Automatic merge failed, ...'