[Emacs-diffs] /srv/bzr/emacs/trunk r111926: * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.

[Paul Eggert]

------------------------------------------------------------
revno: 111926
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sat 2013-03-02 23:26:39 -0800
message:
  * bzrmerge.el (bzrmerge-apply): Omit Latin-1 char from diagnostic.
  
  If there were a real need, it should be UTF-8 anyway.
modified:
  admin/ChangeLog
  admin/bzrmerge.el

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2013-02-25 05:55:37 +0000
+++ b/admin/ChangeLog   2013-03-03 07:26:39 +0000
@@ -1,3 +1,8 @@
+2013-03-03  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        Simplify data_start configuration (Bug#13783).

=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2013-01-01 09:11:05 +0000
+++ b/admin/bzrmerge.el 2013-03-03 07:26:39 +0000
@@ -320,7 +320,7 @@
                   ;; 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")))))