diff options
| author | André Spiegel <spiegel@gnu.org> | 1998-04-05 18:44:35 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 1998-04-05 18:44:35 +0000 |
| commit | e27827ddcc91e77f68c3af495354cb61229b7319 (patch) | |
| tree | de529a52bb4a8fc680966c4358bb0b9c61dafcee /lisp/vc-hooks.el | |
| parent | b690900731835efdb7ca755ca6cbea7b5751492c (diff) | |
| download | emacs-e27827ddcc91e77f68c3af495354cb61229b7319.tar.gz | |
(vc-prefix-map): Added "m" for vc-merge.
Diffstat (limited to 'lisp/vc-hooks.el')
| -rw-r--r-- | lisp/vc-hooks.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 6fe4b75c7c8..a8d3db5fa0e 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -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) |