[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102883: * admin/bzrmerge.el: Fix par
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102883: * admin/bzrmerge.el: Fix paren typo in previous. |
Date: |
Mon, 17 Jan 2011 18:35:23 -0800 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102883
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-01-17 18:35:23 -0800
message:
* admin/bzrmerge.el: Fix paren typo in previous.
modified:
admin/bzrmerge.el
=== modified file 'admin/bzrmerge.el'
--- a/admin/bzrmerge.el 2011-01-17 21:18:00 +0000
+++ b/admin/bzrmerge.el 2011-01-18 02:35:23 +0000
@@ -281,7 +281,7 @@
;; are conflicts.
(display-warning 'bzrmerge "Resolve conflicts manually.
¡BEWARE! Important metadata is kept in this Emacs session!
-Do not commit without re-running `M-x bzrmerge' first!")))
+Do not commit without re-running `M-x bzrmerge' first!"))
(error "Resolve conflicts manually")))))
(cons merge skip)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102883: * admin/bzrmerge.el: Fix paren typo in previous.,
Glenn Morris <=