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

(vc-prefix-map): Added "m" for vc-merge.

Browse source
This commit is contained in:
André Spiegel 1998-04-05 18:44:35 +00:00
parent b690900731
commit e27827ddcc
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/vc-hooks.el
View file

@ -5,7 +5,7 @@
;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
;; $Id: vc-hooks.el,v 1.103 1998/03/20 15:38:48 spiegel Exp rms $
;; $Id: vc-hooks.el,v 1.104 1998/04/04 05:21:44 rms Exp spiegel $
;; This file is part of GNU Emacs.
@ -1147,6 +1147,7 @@ Returns t if checkout was successful, nil otherwise."
(define-key vc-prefix-map "h" 'vc-insert-headers)
(define-key vc-prefix-map "i" 'vc-register)
(define-key vc-prefix-map "l" 'vc-print-log)
(define-key vc-prefix-map "m" 'vc-merge)
(define-key vc-prefix-map "r" 'vc-retrieve-snapshot)
(define-key vc-prefix-map "s" 'vc-create-snapshot)
(define-key vc-prefix-map "u" 'vc-revert-buffer)