Mercurial > emacs

diff admin/ChangeLog @ 112018:b0a317b18658

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* admin/bzrmerge.el: New file to help merge branches while skipping some revisions (e.g. from emacs-23 to trunk).
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 26 Dec 2010 20:27:08 -0500
parents 2278399d2eb9
children 40af77a50adc
line wrap: on
line diff
--- a/admin/ChangeLog	Sun Dec 26 18:17:09 2010 -0500
+++ b/admin/ChangeLog	Sun Dec 26 20:27:08 2010 -0500
@@ -1,3 +1,8 @@
+2010-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* bzrmerge.el: New file to help merge branches while skipping
+	some revisions (e.g. from emacs-23 to trunk).
+
 2010-12-03  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove.