On Mar 02, 2015, at 05:47 PM, Daniel Colascione wrote:

>smerge-mode is handy for resolving conflicts, but it's annoying that
>after resolving them all, smerge turns itself off, and C-c ^ n starts
>inserting stray "n" characters in the buffer. Can we just leave smerge
>on after resolving conflicts?

Me too!  I didn't know about smerge-auto-leave, so I'm giving that a try
(thanks Nicolas!).  Now to generate some conflicts...

Cheers,
-Barry