diff options
| author | Simon Leinen <simon.leinen@gmail.com> | 2012-03-24 21:23:23 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-03-24 21:23:23 +0800 |
| commit | 6e7e90fa24df8bddeab77f9846d74e06f75ed9bc (patch) | |
| tree | 82af6dd112d0b466aef50aefeeece848df1a568b /lisp/emacs-lisp/autoload.el | |
| parent | f06e2758ba96694f76389a65f7395dbae557ba73 (diff) | |
| download | emacs-6e7e90fa24df8bddeab77f9846d74e06f75ed9bc.tar.gz emacs-6e7e90fa24df8bddeab77f9846d74e06f75ed9bc.tar.bz2 emacs-6e7e90fa24df8bddeab77f9846d74e06f75ed9bc.zip | |
* vc/vc.el (vc-merge): Fix a prompt.
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
0 files changed, 0 insertions, 0 deletions