diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-03-02 23:26:39 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-03-02 23:26:39 -0800 |
| commit | 50d8b29da30f41f5ec6c56fd7cbe4c42fa9756ba (patch) | |
| tree | 36fcd75c39bca513946d20fe6a3e79f56f07bf5a | |
| parent | 7254ac084a4d42b9ec0efa5208985a9656a11249 (diff) | |
| download | emacs-50d8b29da30f41f5ec6c56fd7cbe4c42fa9756ba.tar.gz | |
* bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.
If there were a real need, it should be UTF-8 anyway.
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rw-r--r-- | admin/bzrmerge.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 28e25ad98a3..9389a6af28f 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2013-03-03 Paul Eggert <eggert@cs.ucla.edu> + + * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic. + If there were a real need, it should be UTF-8 anyway. + 2013-02-25 Paul Eggert <eggert@cs.ucla.edu> Simplify data_start configuration (Bug#13783). diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index b95c96d77ef..4fa328b9d6d 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -320,7 +320,7 @@ Does not make other difference." ;; bzrmerge-add-metadata does not work when there ;; are conflicts. (display-warning 'bzrmerge "Resolve conflicts manually. -ĦBEWARE! Important metadata is kept in this Emacs session! +BEWARE! Important metadata is kept in this Emacs session! Do not commit without re-running `M-x bzrmerge' first!" :warning bzrmerge-warning-buffer)) (error "Resolve conflicts manually"))))) |