diff options
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/bzrmerge.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el index cedb625fb0d..d54ba330f96 100644 --- a/admin/bzrmerge.el +++ b/admin/bzrmerge.el | |||
| @@ -150,12 +150,12 @@ Type `y' to skip this revision, | |||
| 150 | (format "%s: Skip (y/n/N/q/%s)? " str | 150 | (format "%s: Skip (y/n/N/q/%s)? " str |
| 151 | (key-description (vector help-char))) | 151 | (key-description (vector help-char))) |
| 152 | '(?y ?n ?N ?q))) | 152 | '(?y ?n ?N ?q))) |
| 153 | (`?y (setq skip t)) | 153 | (?y (setq skip t)) |
| 154 | (`?q (keyboard-quit)) | 154 | (?q (keyboard-quit)) |
| 155 | ;; A single log entry can match skip-regexp multiple | 155 | ;; A single log entry can match skip-regexp multiple |
| 156 | ;; times. If you are sure you don't want to skip it, | 156 | ;; times. If you are sure you don't want to skip it, |
| 157 | ;; you don't want to be asked multiple times. | 157 | ;; you don't want to be asked multiple times. |
| 158 | (`?N (setq skip 'no)))))) | 158 | (?N (setq skip 'no)))))) |
| 159 | (if (eq skip t) | 159 | (if (eq skip t) |
| 160 | (push revno skipped) | 160 | (push revno skipped) |
| 161 | (push revno revnos))))) | 161 | (push revno revnos))))) |