diff options
| author | Stefan Monnier | 2002-10-07 16:50:43 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2002-10-07 16:50:43 +0000 |
| commit | 1168d6c273aed7f60e96838560af4b3922683bb7 (patch) | |
| tree | 47d05fa36df263c5cb369193d75ccc75383d841e | |
| parent | edc37d121445a203270a64da3ab2203bf2f0cb91 (diff) | |
| download | emacs-1168d6c273aed7f60e96838560af4b3922683bb7.tar.gz emacs-1168d6c273aed7f60e96838560af4b3922683bb7.zip | |
(vc-resolve-conflicts); Typo.
| -rw-r--r-- | lisp/vc.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc.el b/lisp/vc.el index 740aabae4dd..e91d1a8b55b 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | 6 | ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
| 7 | ;; Keywords: tools | 7 | ;; Keywords: tools |
| 8 | 8 | ||
| 9 | ;; $Id: vc.el,v 1.339 2002/10/05 16:35:28 monnier Exp $ | 9 | ;; $Id: vc.el,v 1.340 2002/10/07 16:24:42 monnier Exp $ |
| 10 | 10 | ||
| 11 | ;; This file is part of GNU Emacs. | 11 | ;; This file is part of GNU Emacs. |
| 12 | 12 | ||
| @@ -2040,7 +2040,7 @@ See Info node `Merging'." | |||
| 2040 | (message "File contains conflict markers")))) | 2040 | (message "File contains conflict markers")))) |
| 2041 | 2041 | ||
| 2042 | ;;;###autoload | 2042 | ;;;###autoload |
| 2043 | (defalias 'vc-resolve-conflicts smerge-ediff) | 2043 | (defalias 'vc-resolve-conflicts 'smerge-ediff) |
| 2044 | 2044 | ||
| 2045 | ;; The VC directory major mode. Coopt Dired for this. | 2045 | ;; The VC directory major mode. Coopt Dired for this. |
| 2046 | ;; All VC commands get mapped into logical equivalents. | 2046 | ;; All VC commands get mapped into logical equivalents. |