1 files changed, 1 insertions, 1 deletions

diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index c0f6fd426c1..3744ec501ec 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -1444,7 +1444,7 @@ region, or with a numeric prefix.  By default it uses a numeric prefix of 1."
   ;; conflicts instead!
   (condition-case err
       (smerge-match-conflict)
-    (error (if (not (markerp otherpos)) (signal (car err) (cdr err))
+    (error (if (not (markerp otherpos)) (signal err)
              (goto-char (prog1 otherpos (setq otherpos (point-marker))))
              (smerge-match-conflict))))
   (let ((beg (match-beginning 0))