From: Stefan Kangas Date: Thu, 11 Nov 2021 09:22:05 +0000 (+0100) Subject: ; * admin/gitmerge.el: Fix typos. X-Git-Tag: emacs-29.0.90~3668^2~53 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=12a638d845ec19f632f4257fbeaf00c9a87f7d54;p=emacs.git ; * admin/gitmerge.el: Fix typos. --- diff --git a/admin/gitmerge.el b/admin/gitmerge.el index adb13fc4e2e..67fca87c119 100644 --- a/admin/gitmerge.el +++ b/admin/gitmerge.el @@ -37,10 +37,10 @@ ;; up-to-date). ;; - Mark commits you'd like to skip, meaning to only merge their ;; metadata (merge strategy 'ours'). -;; - Hit 'm' to start merging. Skipped commits will be merged separately. +;; - Hit 'm' to start merging. Skipped commits will be merged separately. ;; - If conflicts cannot be resolved automatically, you'll have to do -;; it manually. In that case, resolve the conflicts and restart -;; gitmerge, which will automatically resume. It will add resolved +;; it manually. In that case, resolve the conflicts and restart +;; gitmerge, which will automatically resume. It will add resolved ;; files, commit the pending merge and continue merging the rest. ;; - Inspect master branch, and if everything looks OK, push. @@ -129,7 +129,7 @@ If nil, the function `gitmerge-default-branch' guesses.") (string-to-number (match-string 1)))) (defun gitmerge-default-branch () - "Default for branch that should be merged; eg \"origin/emacs-26\"." + "Default for branch that should be merged; e.g. \"origin/emacs-28\"." (or gitmerge-default-branch (format "origin/emacs-%s" (1- (gitmerge-emacs-version))))) @@ -472,7 +472,7 @@ Throw an user-error if we cannot resolve automatically." (if (not (zerop (call-process "git" nil t nil "diff" "--name-only" "--diff-filter=U"))) - (error "Error listing unmerged files. Resolve manually.") + (error "Error listing unmerged files. Resolve manually.") (goto-char (point-min)) (while (not (eobp)) (push (buffer-substring (point) (line-end-position)) files)