diff options
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. |