Re: smerge-mode is fantastic, but it annoys me

[Stefan Monnier]

> It seems you should set smerge-auto-leave to nil. Are you saying it
> should be the default ? I would agree because the automated turn-off is
> a bit surprising. Or it should maybe be documented in the docstring of
> smerge-mode itself.

I don't have a strong opinion on this.  I defaulted it to t because
I personally like this feature (I look at the mode line to know
if there are conflicts left, and I use an smerge-prefix that is mildly
annoying for "normal" editing, so turning it off early helps me avoid
key conflicts).


        Stefan