]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Thu, 11 Nov 2021 06:17:56 +0000 (07:17 +0100)
committerStefan Kangas <stefan@marxist.se>
Thu, 11 Nov 2021 06:17:56 +0000 (07:17 +0100)
commit3e234943940534cc55062b04db41000531f02615
tree2f5513897ebe3467b040f0fa47f5166ee42c452b
parentf30f53115928fd65d066944d53d07742b0807670
parent2963de6540a1dc57399eaf530d8e12c794137a84
Merge from origin/emacs-28

2963de6540 * lisp/vc/vc-git.el (vc-git-mergebase): More meaningful er...
a9148cdee5 ; Fix heading in etc/NEWS
9623342216 ; * etc/NEWS: Move a bookmark related item further down.

# Conflicts:
# etc/NEWS
etc/NEWS.28