diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /lisp/vc/diff-mode.el | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'lisp/vc/diff-mode.el')
| -rw-r--r-- | lisp/vc/diff-mode.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index d9224b29c2e..e945d6ef160 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el | |||
| @@ -124,7 +124,6 @@ when editing big diffs)." | |||
| 124 | ("A" . diff-ediff-patch) | 124 | ("A" . diff-ediff-patch) |
| 125 | ("r" . diff-restrict-view) | 125 | ("r" . diff-restrict-view) |
| 126 | ("R" . diff-reverse-direction) | 126 | ("R" . diff-reverse-direction) |
| 127 | ("/" . diff-undo) | ||
| 128 | ([remap undo] . diff-undo)) | 127 | ([remap undo] . diff-undo)) |
| 129 | "Basic keymap for `diff-mode', bound to various prefix keys." | 128 | "Basic keymap for `diff-mode', bound to various prefix keys." |
| 130 | :inherit special-mode-map) | 129 | :inherit special-mode-map) |