From: Stefan Kangas <stefan@marxist.se>
Date: Tue, 9 Aug 2022 04:30:25 +0000 (+0200)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~1447^2~292
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2053c6aca170f6ced8928b38328a22604171d8b7;p=emacs.git

Merge from origin/emacs-28

d91ffdbec2 Don't mention XEmacs toolbar in ediff manual
---

2053c6aca170f6ced8928b38328a22604171d8b7