]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-28
authorStefan Kangas <stefan@marxist.se>
Thu, 16 Dec 2021 05:31:48 +0000 (06:31 +0100)
committerStefan Kangas <stefan@marxist.se>
Thu, 16 Dec 2021 05:31:48 +0000 (06:31 +0100)
1e578267fb Fix control buffer window height in 'ediff-setup-control-b...

1  2 
lisp/vc/ediff-util.el

Simple merge