diff options
| author | Glenn Morris | 2011-02-02 23:09:50 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-02 23:09:50 -0800 |
| commit | f6041baa9d84125b0af4939b2d05edc0c59f034a (patch) | |
| tree | e5edd5191c78a130b0688377cb86fbd9c5c56ce6 /admin/ChangeLog | |
| parent | fd7ec1ba35a61bd68d82704e9fe4c6b60513f83f (diff) | |
| download | emacs-f6041baa9d84125b0af4939b2d05edc0c59f034a.tar.gz emacs-f6041baa9d84125b0af4939b2d05edc0c59f034a.zip | |
bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-buffer): New constant.
(bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it.
(bzrmerge-missing): If nothing to do, return nil not (nil).
(bzrmerge-apply): Remove odd character from message.
(bzrmerge): Give status messages.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index f7d60b08e4c..46dbaa0da26 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,7 +1,15 @@ | |||
| 1 | 2011-02-03 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-buffer): New constant. | ||
| 4 | (bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it. | ||
| 5 | (bzrmerge-missing): If nothing to do, return nil not (nil). | ||
| 6 | (bzrmerge-apply): Remove odd character from message. | ||
| 7 | (bzrmerge): Give status messages. | ||
| 8 | |||
| 1 | 2011-01-31 Eli Zaretskii <eliz@gnu.org> | 9 | 2011-01-31 Eli Zaretskii <eliz@gnu.org> |
| 2 | 10 | ||
| 3 | * admin.el (set-version): Remove lib-src/makefile.w32-in. Add | 11 | * admin.el (set-version): Remove lib-src/makefile.w32-in. |
| 4 | nt/config.nt. | 12 | Add nt/config.nt. |
| 5 | 13 | ||
| 6 | 2011-01-31 Paul Eggert <eggert@cs.ucla.edu> | 14 | 2011-01-31 Paul Eggert <eggert@cs.ucla.edu> |
| 7 | 15 | ||