summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 73c6369e76d..134b3bb3329 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
emacs-snapshot (29.1~git20221203.1) UNRELEASED; urgency=medium
* Package git snapshot.
+ * d/merge-snapshot: don't hard code "origin/master" in merge messages.
+ We are presently merging from the emacs-29 branch.
-- Sean Whitton <spwhitton@spwhitton.name> Sun, 04 Dec 2022 17:07:06 -0700