• Chong Yidong's avatar
    Rudimentary support for vc-pull and vc-merge in Git and Mercurial. · 659114fd
    Chong Yidong authored
    * lisp/vc/vc.el (vc-pull): Make vc-update an alias for this, instead of
    the other way around.
    
    * lisp/vc/vc-git.el (vc-git-branches, vc-git-pull)
    (vc-git-merge-branch): New functions.
    (vc-git-history): New var.
    
    * lisp/vc/vc-hg.el (vc-hg-history): New var.
    (vc-hg-pull): Perform default pull if called via Lisp by vc-pull.
    (vc-hg-merge-branch): New function.
    659114fd
vc-hg.el 24.5 KB