]> git.eshelyaron.com Git - emacs.git/commit
; Fix a merge snafu.
authorEli Zaretskii <eliz@gnu.org>
Sat, 29 Mar 2025 12:54:30 +0000 (08:54 -0400)
committerEshel Yaron <me@eshelyaron.com>
Mon, 31 Mar 2025 08:35:24 +0000 (10:35 +0200)
commit71d4bce71a3a055b854f48aff18e538f70c6ee47
tree406ab60cbdbd0cc2a0fef8d589411fcd25dfc1c9
parentf5e90e69811f7a28f2e988b587606500c4239652
; Fix a merge snafu.

(cherry picked from commit 988111937b44433490d20593c2a1e543575ae940)
doc/emacs/ack.texi
doc/misc/cc-mode.texi