procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* admin/bzrmerge.el: Fix paren typo in previous.

Browse source
This commit is contained in:
Glenn Morris 2011-01-17 18:35:23 -08:00
parent b91f171d26
commit acce4a473a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/bzrmerge.el
View file

@ -281,7 +281,7 @@ Does not make other difference."
;; 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)))))