From 771ab2136790a9750481f391feb32cd6e130cb06 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 11 Mar 2026 12:15:49 -0400 Subject: [PATCH] lisp/vc/smerge-mode.el (smerge--refine-apply-diff): Typo --- lisp/vc/smerge-mode.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index 92f924e4f5e..91be4fa5b66 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -1242,7 +1242,7 @@ need to be markers to indicate the corresponding buffers)." (with-current-buffer (overlay-buffer ol1) (goto-char pt1) ;; Usually ol1 and ol2 are in the same buffer, so do the `set-buffer' - ;; from ol1 to maximize the change that it's a no-op. + ;; from ol1 to maximize the chance that it's a no-op. (with-current-buffer (overlay-buffer ol2) (goto-char pt2)))))) (defun smerge--refine-apply-diff-1 ( diffbuf ol1 ol2