# HG changeset patch
# User Andr��� Spiegel <spiegel@gnu.org>
# Date 891801875 0
# Node ID 399e7453bf89d06b9a90bd85dd1c4868ae7b75d1
# Parent  e7b64d0b3b3d0abe216d430a3c1cc1e7e2420d4e
(vc-prefix-map): Added "m" for vc-merge.

diff -r e7b64d0b3b3d -r 399e7453bf89 lisp/vc-hooks.el
--- a/lisp/vc-hooks.el	Sun Apr 05 18:43:15 1998 +0000
+++ b/lisp/vc-hooks.el	Sun Apr 05 18:44:35 1998 +0000
@@ -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 @@
       (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)