procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(vc-resolve-conflicts); Typo.

Browse source
This commit is contained in:
Stefan Monnier 2002-10-07 16:50:43 +00:00
parent edc37d1214
commit 1168d6c273
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/vc.el
View file

@ -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 @@ See Info node `Merging'."
(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.