Skip to content

GitLab

Switch branch/tag
Find file BlameHistoryPermalink
  • Eric S. Raymond's avatar
    Refactor VC merging to fix a layer violation. · d17bae90
    Eric S. Raymond authored 
    * 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.
    d17bae90
vc.el 119 KB