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

2 files changed, 2 insertions, 2 deletions

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index fa8c9c0f3de..b9b511fbee2 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 eb7080bb8be..fd99c175013 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