git.eshelyaron.com Git - emacs.git/commit

]> git.eshelyaron.com Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: be42fdc f2ae398)

author	Eli Zaretskii <eliz@gnu.org>
	Wed, 13 Apr 2022 13:52:50 +0000 (16:52 +0300)
committer	Eli Zaretskii <eliz@gnu.org>
	Wed, 13 Apr 2022 13:52:50 +0000 (16:52 +0300)
commit	5a14406ecfbd1efd03a00c49a84c19d31bb77f48
tree	0ef3345816636a1530806b2585ba1f40c30c84de	tree \| snapshot
parent	be42fdc6dc60bec1d14065d04dc43b693398c591	commit \| diff
parent	f2ae39829812098d8269eafbc0fcb98959ee5bb7	commit \| diff

Merge from origin/emacs-28

# Conflicts:
# etc/NEWS
# lisp/desktop.el
# lisp/dired.el

etc/NEWS.28	diff1 \|	\|	blob \| history
lisp/dired.el	diff1 \|	diff2 \|	blob \| history
lisp/font-lock.el	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.