diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-08-15 09:29:11 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-08-15 09:29:11 -0700 |
| commit | 2a1e24765bc3de7bf72e7117893307f6f6c441be (patch) | |
| tree | 95cbfdc4e94f4f7c899e2ceea99b771928e4937a /lisp/vc/smerge-mode.el | |
| parent | eb424fe3d660eebd9b74dd5d2875e2e4b7b3307f (diff) | |
| download | emacs-2a1e24765bc3de7bf72e7117893307f6f6c441be.tar.gz | |
Replace version 24.2 with 24.3 where appropriate (hopefully)
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index e6b63030fef..babcf6f1beb 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -138,7 +138,7 @@ Used in `smerge-diff-base-mine' and related functions." (t :inverse-video t)) "Face used for removed characters shown by `smerge-refine'." :group 'smerge - :version "24.2") + :version "24.3") (defface smerge-refined-added '((default @@ -150,7 +150,7 @@ Used in `smerge-diff-base-mine' and related functions." (t :inverse-video t)) "Face used for added characters shown by `smerge-refine'." :group 'smerge - :version "24.2") + :version "24.3") (easy-mmode-defmap smerge-basic-map `(("n" . smerge-next) |