* lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 23 May 2011 17:03:03 +0000 (14:03 -0300)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 23 May 2011 17:03:03 +0000 (14:03 -0300)
commit782fc81943849d699d74c3039be80d4068bb3422
treea54566cb6d5b2d5fe56953e09610f0c902368f6a
parente44e373d300c23adac9b2606aac4fc7e11138fde
* lisp/vc/smerge-mode.el (smerge-refine-subst): Don't deactivate the mark.

Fixes: debbugs:8710
lisp/ChangeLog
lisp/vc/smerge-mode.el