]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'no-ls-lisp-advice'
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 21 Dec 2023 14:37:12 +0000 (09:37 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 21 Dec 2023 14:37:12 +0000 (09:37 -0500)
1  2 
lisp/dired.el
lisp/files.el

diff --cc lisp/dired.el
Simple merge
diff --cc lisp/files.el
Simple merge