diff options
| author | Glenn Morris | 2011-02-12 15:37:43 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-02-12 15:37:43 -0800 |
| commit | 7b24e97ab5015b43dd76ccc2ed6fdd49f03fa64a (patch) | |
| tree | c6e7cda5b36d48bcb57c3de264e849f0141b884d /admin/ChangeLog | |
| parent | cdfa139da44fd9b1a5425400635e474e85d866f4 (diff) | |
| download | emacs-7b24e97ab5015b43dd76ccc2ed6fdd49f03fa64a.tar.gz emacs-7b24e97ab5015b43dd76ccc2ed6fdd49f03fa64a.zip | |
* admin/bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 0ca88ee84d5..5f4dd11ec0f 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-02-12 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-resolve): Fix bzr revert call. | ||
| 4 | |||
| 1 | 2011-02-05 Glenn Morris <rgm@gnu.org> | 5 | 2011-02-05 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * bzrmerge.el (bzrmerge-warning-buffer): New constant. | 7 | * bzrmerge.el (bzrmerge-warning-buffer): New constant. |