diff options
| author | Eric S. Raymond | 2014-12-01 11:41:45 -0500 |
|---|---|---|
| committer | Eric S. Raymond | 2014-12-01 11:43:10 -0500 |
| commit | d17bae9039021b600ceaec93f2f0e888b12e523d (patch) | |
| tree | f6ea0b50386d04f4c584415bed7c5221b872d4de /admin | |
| parent | dce46a7484d9898cc161a8333ec71db3480b110b (diff) | |
| download | emacs-d17bae9039021b600ceaec93f2f0e888b12e523d.tar.gz emacs-d17bae9039021b600ceaec93f2f0e888b12e523d.zip | |
Refactor VC merging to fix a layer violation.
* vc/vc.el, vc/vc-cvs.el, vc/vc-rcs.el, vc/vc-svn.el: The 'merge'
backend method of RCS/CVS/SVN is now 'merge-file', to contrast with
'merge-branch'. Prompting for merge revisions is pushed down to the
back ends; this fixes a layering violation that caused bad behavior
with SVN.
Diffstat (limited to 'admin')
0 files changed, 0 insertions, 0 deletions