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: c18bfbe b77f6af)

author	Glenn Morris <rgm@gnu.org>
	Fri, 6 Aug 2021 15:49:32 +0000 (08:49 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Fri, 6 Aug 2021 15:49:32 +0000 (08:49 -0700)
commit	0b049fe71d73f6885a3c81ea31829e3befc18933
tree	77fc29c174e71bfe1943d78fde317f4da6928fd4	tree \| snapshot
parent	c18bfbe6e452bfbef276fc8325bdbfc6c7e0d61b	commit \| diff
parent	b77f6af24e9193a4f70622cda6d641c58e885c22	commit \| diff

Merge from origin/emacs-27

b77f6af24e (origin/emacs-27) ERC right stamps: also use latest buffer...

# Conflicts:
# lisp/erc/erc-stamp.el

lisp/erc/erc-stamp.el

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