diff options
Diffstat (limited to 'lisp/vc.el')
| -rw-r--r-- | lisp/vc.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 6fd6e25bd88..995bcc25692 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -2620,12 +2620,12 @@ changes from the current branch are merged into the working file." (if (eq (vc-checkout-model file) 'locking) (if (eq (vc-state file) 'edited) (error "%s" - (substitute-command-keys - "File is locked--type \\[vc-revert] to discard changes")) + (substitute-command-keys + "File is locked--type \\[vc-revert] to discard changes")) (error "Unexpected file state (%s) -- type %s" - (vc-state file) - (substitute-command-keys - "\\[vc-next-action] to correct")) + (vc-state file) + (substitute-command-keys + "\\[vc-next-action] to correct"))) (if (not (vc-find-backend-function (vc-backend file) 'merge-news)) (error "Sorry, merging news is not implemented for %s" (vc-backend file)) |