[Emacs-diffs] master 8d99e23 3/5: Merge from origin/emacs-26

[Paul Eggert]

branch: master
commit 8d99e233147d44c2176cef599db754d06b12f5e3
Merge: d5ccb74 6c30313
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-26
    
    6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t...
    98288ecaff Further workaround for faulty localtime() under macOS 10.6
---
 admin/gitmerge.el     | 2 +-
 lisp/org/org-clock.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index fa8c9c0..b9b511f 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -400,7 +400,7 @@ Throw an user-error if we cannot resolve automatically."
                    "\n  - You can safely close this Emacs session and do this "
                    "in a new one."
                    "\n  - When running gitmerge again, remember that you must "
-                   "that from within the Emacs repo.\n")
+                   "do that from within the Emacs repo.\n")
            (pop-to-buffer (current-buffer)))
          (user-error "Resolve the conflicts manually"))))))
 
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index eb7080b..fd99c17 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -487,7 +487,7 @@ to add an effort property.")
                                    "10\\.6\\.[[:digit:]]"
                                    (shell-command-to-string
                                     "sw_vers -productVersion"))
-                                  (<= m -1034058203136))
+                                  (<= m -1034058203135))
                        (ignore-errors (decode-time (list m 0)))))))
         (low
          (funcall dichotomy