From 3e615a7c9c1dd1060f1d5004b9eb0d47405fcce3 Mon Sep 17 00:00:00 2001 From: notmike Date: Sun, 21 Sep 2025 17:47:59 -0600 Subject: [PATCH 1/2] lisp/vc/emerge.el: fixed a typo --- lisp/vc/emerge.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index 56afcf4b7af8..adebbd2aac99 100644 --- a/lisp/vc/emerge.el +++ b/lisp/vc/emerge.el @@ -2874,7 +2874,7 @@ for details of the querying process." "Ask the user whether to save or write out the incomplete merge. If answer is yes, call COMMAND interactively. During the call, the flags around the current difference are removed." - (if (yes-or-no-p "Do you really write to write out this unfinished merge? ") + (if (yes-or-no-p "Do you really want to write out this unfinished merge? ") ;; He really wants to do it -- unselect the difference for the duration (progn (if (and (>= emerge-current-difference 0) From c8796cd373c4930ebf2410bc7ddc6a220cb213e6 Mon Sep 17 00:00:00 2001 From: notmike Date: Sun, 21 Sep 2025 20:31:35 -0600 Subject: [PATCH 2/2] Makes the documentation a bit more inclusive --- lisp/vc/emerge.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index adebbd2aac99..0a12e9b50b35 100644 --- a/lisp/vc/emerge.el +++ b/lisp/vc/emerge.el @@ -2875,7 +2875,7 @@ for details of the querying process." If answer is yes, call COMMAND interactively. During the call, the flags around the current difference are removed." (if (yes-or-no-p "Do you really want to write out this unfinished merge? ") - ;; He really wants to do it -- unselect the difference for the duration + ;; They really want to do it -- unselect the difference for the duration (progn (if (and (>= emerge-current-difference 0) (< emerge-current-difference emerge-number-of-differences)) @@ -2890,7 +2890,7 @@ around the current difference are removed." (progn (emerge-select-difference emerge-current-difference) (emerge-recenter)))) - ;; He's being smart and not doing it + ;; They're being smart and not doing it... (message "Not written"))) ;; Make sure the current buffer (for a file) has the same contents as the