changeset 47781:79bdd88fb006

(vc-resolve-conflicts); Typo.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 07 Oct 2002 16:50:43 +0000
parents 27caec378c23
children de56ca3f523d
files lisp/vc.el
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc.el	Mon Oct 07 16:24:42 2002 +0000
+++ b/lisp/vc.el	Mon Oct 07 16:50:43 2002 +0000
@@ -6,7 +6,7 @@
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 ;; Keywords: tools
 
-;; $Id: vc.el,v 1.339 2002/10/05 16:35:28 monnier Exp $
+;; $Id: vc.el,v 1.340 2002/10/07 16:24:42 monnier Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -2040,7 +2040,7 @@
       (message "File contains conflict markers"))))
 
 ;;;###autoload
-(defalias 'vc-resolve-conflicts smerge-ediff)
+(defalias 'vc-resolve-conflicts 'smerge-ediff)
 
 ;; The VC directory major mode.  Coopt Dired for this.
 ;; All VC commands get mapped into logical equivalents.