From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 9 Nov 2017 03:22:26 +0000 (-0800)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6172
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8d99e233147d44c2176cef599db754d06b12f5e3;p=emacs.git

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

8d99e233147d44c2176cef599db754d06b12f5e3