diff options
| author | Po Lu <luangruo@yahoo.com> | 2024-08-20 21:57:25 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2024-08-20 21:57:25 +0800 |
| commit | 4361649901667b4efe89e560c36f3047634de8ec (patch) | |
| tree | 587f9716c2141d3bffeca2487157e9efb8a01971 /Makefile.in | |
| parent | 5e940a353e37a4867758d13a32928ed18fc437dc (diff) | |
| parent | d6726e6dfc7f0a5133a0489bcdc21f10844692f2 (diff) | |
Merge from savannah/emacs-30
d6726e6dfc7 Further fix of reading and writing profiler data
30b2fae77b7 * Makefile.in (PREFERRED_BRANCH): Update to emacs-30.
5397808e5bc ; Eliminate more C++ comments
1463434907e ; Eliminate C++ comments and typo
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index ade7d258a4c..93e8f1ae5cd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1319,7 +1319,7 @@ ChangeLog: ./$(emacslog) -o $(CHANGELOG) -n $(CHANGELOG_HISTORY_INDEX_MAX) # Check that we are in a good state for changing history. -PREFERRED_BRANCH = emacs-28 +PREFERRED_BRANCH = emacs-30 preferred-branch-is-current: git branch | grep -q '^\* $(PREFERRED_BRANCH)$$' unchanged-history-files: |