aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org8
1 files changed, 7 insertions, 1 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index b6625a0..4f63567 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,12 +54,18 @@ After resolving the conflict, run
NOTE: Look for "ONSYNC" for changes that should be considered when
syncing, but that don't seem appropriate for Org backport.
-** master branch [36/56]
+** master branch [36/57]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
+- [ ] 486094126ba77e45c50acb87f5ad3e4147608446
+
+ Merge from origin/emacs-29
+ Eli Zaretskii
+ Sat Dec 9 07:25:21 2023 -0500
+
- [X] c9d7740574758d47c8864cbada5fd2a2b2ee8911
Merge from origin/emacs-29