From: Renato Botelho <garga@freebsd.org>
Date: Fri, 19 Mar 2021 14:44:30 GMT
Subject: --no-edit not respected after conflict
Message-ID: <4442fd0a-3306-a22b-3614-e3272f8f0be5@FreeBSD.org>

I was reverting multiple commits using --no-edit parameter and after one 
of those commits conflicted and I resolved using mergetool, no-edit 
option was not respected anymore and next commits opened editor for me 
to review commit message.
-- 
Renato Botelho