andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.

Browse source 
If there were a real need, it should be UTF-8 anyway.
This commit is contained in:
Paul Eggert 2013-03-02 23:26:39 -08:00
parent 7254ac084a
commit 50d8b29da3
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
admin/ChangeLog
View file

@ -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).

2
admin/bzrmerge.el
View file

@ -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.
、EWARE! 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")))))