diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-17 18:35:23 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-17 18:35:23 -0800 |
| commit | acce4a473ad27f2dec42cf2d35ffe3bb1acd471a (patch) | |
| tree | 15a717201a720d3f4eb0ce3c6fc432258f3cfc5d /admin/bzrmerge.el | |
| parent | b91f171d26b162cc1842380b51adb6d6dedb6248 (diff) | |
| download | emacs-acce4a473ad27f2dec42cf2d35ffe3bb1acd471a.tar.gz | |
* admin/bzrmerge.el: Fix paren typo in previous.
Diffstat (limited to 'admin/bzrmerge.el')
| -rw-r--r-- | admin/bzrmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index 68b107be65e..85d0f14091a 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el @@ -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))))) |