diff options
| author | Glenn Morris | 2011-02-05 14:46:34 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-05 14:46:34 -0800 |
| commit | 4d881c83419fbdbcfc4ba8cc8b0ef88eb9c45ccd (patch) | |
| tree | 24fb2b255d752532167cb2a0d0bcf58c7b1daf0d /admin/ChangeLog | |
| parent | 233ba4d924933cb56129bd7511e6137b7c0b8e3e (diff) | |
| download | emacs-4d881c83419fbdbcfc4ba8cc8b0ef88eb9c45ccd.tar.gz emacs-4d881c83419fbdbcfc4ba8cc8b0ef88eb9c45ccd.zip | |
bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-warning-buffer): New constant.
(bzrmerge-apply): Use it.
(bzrmerge): Kill any old warning buffer first.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 46dbaa0da26..0ca88ee84d5 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-02-05 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-warning-buffer): New constant. | ||
| 4 | (bzrmerge-apply): Use it. | ||
| 5 | (bzrmerge): Kill any old warning buffer first. | ||
| 6 | |||
| 1 | 2011-02-03 Glenn Morris <rgm@gnu.org> | 7 | 2011-02-03 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * bzrmerge.el (bzrmerge-buffer): New constant. | 9 | * bzrmerge.el (bzrmerge-buffer): New constant. |