diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-26 20:27:08 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-12-26 20:27:08 -0500 |
| commit | 9ebea0e7469db88856f238d113878913503266d0 (patch) | |
| tree | 4476a3c66906fe2c0e75914fa6ac8dfd8ff69fa0 /admin/ChangeLog | |
| parent | 723ee192a5b3c6ebf589d325d5d004e57ce42652 (diff) | |
* admin/bzrmerge.el: New file to help merge branches while skipping
some revisions (e.g. from emacs-23 to trunk).
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index f5c52f0937..601f577523 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -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. |