diff options
| author | Yuan Fu | 2025-03-13 20:18:03 -0700 |
|---|---|---|
| committer | Yuan Fu | 2025-03-13 20:18:03 -0700 |
| commit | f2f1fb7fe00d6d69fc081f423c1f9dff0f618e36 (patch) | |
| tree | a34b67556422221faf26d24c95e0a93d8dfed961 /test/lisp/vc/diff-mode-resources | |
| parent | 89441e12e2a25d43d1d5567ac356a7ecb8193063 (diff) | |
| parent | defc55bb6f954276a1cb9e3b5c50251ba5e5b40f (diff) | |
| download | emacs-f2f1fb7fe00d6d69fc081f423c1f9dff0f618e36.tar.gz emacs-f2f1fb7fe00d6d69fc081f423c1f9dff0f618e36.zip | |
Merge from origin/emacs-30
defc55bb6f9 Fix treesit-parser-create behavior regarding indirect buf...
20ac26e6751 ; Fix with-delayed-message docstring metavars.
04034cd9ce7 Fix 'dired-movement-style' in Dired when subdirs are shown
f8443dffc1f ; * lisp/register.el (register-use-preview): Doc fix (bug...
f729828bcfb ; Add texinfo reference to GNU Coding Standards.
a6abb88fdcc ; * lisp/files.el (executable-find): Doc fix.
# Conflicts:
# src/treesit.c
Diffstat (limited to 'test/lisp/vc/diff-mode-resources')
| -rw-r--r-- | test/lisp/vc/diff-mode-resources/git.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lisp/vc/diff-mode-resources/git.patch b/test/lisp/vc/diff-mode-resources/git.patch index 05ec90d105c..fdb586d37d3 100644 --- a/test/lisp/vc/diff-mode-resources/git.patch +++ b/test/lisp/vc/diff-mode-resources/git.patch | |||
| @@ -47,5 +47,5 @@ index 9f6c5fe43e47eab441232e54456c5c2b06297b65..7b3f91a8b4ed923c8f43183276e3ab36 | |||
| 47 | if __name__ == "__main__": | 47 | if __name__ == "__main__": |
| 48 | main() | 48 | main() |
| 49 | 49 | ||
| 50 | -- | 50 | -- |
| 51 | 2.40.0 | 51 | 2.40.0 |