Skip to content

lisp/vc/emerge.el: fixed a typo #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

lisp/vc/emerge.el: fixed a typo #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e615a7
lisp/vc/emerge.el: fixed a typo
notmike-5 Sep 21, 2025
c8796cd
Makes the documentation a bit more inclusive
notmike-5 Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lisp/vc/emerge.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2874,8 +2874,8 @@ 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? ")
;; He really wants to do it -- unselect the difference for the duration
(if (yes-or-no-p "Do you really want to write out this unfinished merge? ")
;; 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))
Expand All @@ -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
Expand Down