diff options
| author | Stefan Monnier | 2011-01-17 16:18:00 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2011-01-17 16:18:00 -0500 |
| commit | 41f44310b35b8246475d707b3417e42a03b1ca05 (patch) | |
| tree | 45eb63415cc44032cc52d572ca2a553c451a8d84 /admin/ChangeLog | |
| parent | 61f74651c4d5d7502069263ce763cb8685b81ad8 (diff) | |
| download | emacs-41f44310b35b8246475d707b3417e42a03b1ca05.tar.gz emacs-41f44310b35b8246475d707b3417e42a03b1ca05.zip | |
* admin/bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in
an inconsistent state.
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 ca310c1b8f1..6a698728b6c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-01-17 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in | ||
| 4 | an inconsistent state. | ||
| 5 | |||
| 1 | 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-01-17 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 7 | ||
| 3 | Update copyright notes to match recent gnulib-related changes. | 8 | Update copyright notes to match recent gnulib-related changes. |