diff options
| author | Glenn Morris | 2012-01-18 22:42:57 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-01-18 22:42:57 -0800 |
| commit | 54de86ac6216fc2eece477308dde090381d6b6c7 (patch) | |
| tree | 81ec4c77d0121a27eb6e26f1edf4b8ad42fd18a4 /admin/ChangeLog | |
| parent | 606c44c4cfea818143b9007754331dcf4fa06561 (diff) | |
| download | emacs-54de86ac6216fc2eece477308dde090381d6b6c7.tar.gz emacs-54de86ac6216fc2eece477308dde090381d6b6c7.zip | |
Small bzrmerge.el change.
* admin/bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer
to the "skip?" question, since there can be multiple such for any revision.
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 597beb60ce2..2178df6caf0 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-01-19 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-missing): Allow a definitive "no" answer to the | ||
| 4 | "skip?" question, since there can be multiple such for any revision. | ||
| 5 | |||
| 1 | 2012-01-14 Eli Zaretskii <eliz@gnu.org> | 6 | 2012-01-14 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as | 8 | * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as |