--no-edit not respected after conflict

[Renato Botelho <garga@xxxxxxxxxxx>]

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