On Wed, Mar 4, 2015 at 9:15 AM, Nicolas Richard <theonewiththeevillook@yahoo.fr> wrote:

The mode will turn itself off after the last conflict is
resolved, if the variable `smerge-auto-leave' is non-nil.

I find it clearer to list pre-conditions first and then causes before effects:

If `smerge-auto-leave' is non-nil then as soon as the last conflict is resolved smerge-mode turns itself off.

/john