mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-26

Browse source 
6c3031399b * admin/gitmerge.el (gitmerge-resolve-unmerged): Fix doc t...
98288ecaff Further workaround for faulty localtime() under macOS 10.6
This commit is contained in:
Paul Eggert 2017-11-08 19:22:26 -08:00
commit 8d99e23314
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/gitmerge.el
View file

@ -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"))))))

2
lisp/org/org-clock.el
View file

@ -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