Hi Glenn,

I really appreciate the changes in this commit
http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=bdfee01a6567b9f08f82bc84d1196e6cb62587ca

smerge-upper is much clearer than smerge-merge; and the same for
smerge-lower vs smerge-other.

Though, I was surprised to see that this change was not mentioned in NEWS
in the master branch.

Can you please add that?

Thanks.
-- 

Kaushal Modi