diff options
| author | Paul Eggert | 2015-11-10 10:22:29 -0800 |
|---|---|---|
| committer | Paul Eggert | 2015-11-10 10:23:00 -0800 |
| commit | c92dbd6d0c234ff993acb0a095c024593bc185c8 (patch) | |
| tree | f6e1be4508825d465244f4849e2ab33209d8cc84 /lisp/vc | |
| parent | d149ca81c33ab95900306c3c71f6eff62a3ec1a1 (diff) | |
| download | emacs-c92dbd6d0c234ff993acb0a095c024593bc185c8.tar.gz emacs-c92dbd6d0c234ff993acb0a095c024593bc185c8.zip | |
Spelling fixes
* lisp/net/soap-inspect.el (soap-inspect-xs-simple-type):
Fix misspelling in output.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index efd816b4f0e..178b5f0c0ce 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -2071,7 +2071,7 @@ changes from the current branch." | |||
| 2071 | ;;;###autoload | 2071 | ;;;###autoload |
| 2072 | (defun vc-message-unresolved-conflicts (filename) | 2072 | (defun vc-message-unresolved-conflicts (filename) |
| 2073 | "Display a message indicating unresolved conflicts in FILENAME." | 2073 | "Display a message indicating unresolved conflicts in FILENAME." |
| 2074 | ;; This enables all VC backends to give a standard, recognizeable | 2074 | ;; This enables all VC backends to give a standard, recognizable |
| 2075 | ;; conflict message that indicates which file is conflicted. | 2075 | ;; conflict message that indicates which file is conflicted. |
| 2076 | (message "There are unresolved conflicts in %s" filename)) | 2076 | (message "There are unresolved conflicts in %s" filename)) |
| 2077 | 2077 | ||