aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/vc/pcvs.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index f6a9e08d84b..3fdee100d44 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -2312,7 +2312,7 @@ this file, or a list of arguments to send to the program."
2312 (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes) 2312 (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes)
2313 ;; `preserve-modes' avoids changing the (minor) modes. But we 2313 ;; `preserve-modes' avoids changing the (minor) modes. But we
2314 ;; do want to reset the mode for VC, so we do it explicitly. 2314 ;; do want to reset the mode for VC, so we do it explicitly.
2315 (vc-find-file-hook) 2315 (vc-refresh-state)
2316 (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT) 2316 (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT)
2317 (smerge-start-session)))))))) 2317 (smerge-start-session))))))))
2318 2318