| commit | 6e7e90fa24df8bddeab77f9846d74e06f75ed9bc | |
| author | Simon Leinen <simon.leinen@gmail.com> | |
| Sat, 24 Mar 2012 13:23:23 +0000 (24 21:23 +0800) | ||
| committer | Chong Yidong <cyd@gnu.org> | |
| Sat, 24 Mar 2012 13:23:23 +0000 (24 21:23 +0800) | ||
| tree | 82af6dd112d0b466aef50aefeeece848df1a568b | treesnapshot (tar.gz zip) |
| parent | f06e2758ba96694f76389a65f7395dbae557ba73 | commitdiff |
* vc/vc.el (vc-merge): Fix a prompt.
| lisp/ChangeLog | diffblobblamehistory | |
| lisp/vc/vc.el | diffblobblamehistory |