Mercurial > emacs
view etc/images/letter.xpm @ 111679:33ed3cf8260b
Initial support for unified DVCS pull and merge.
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.
* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available. Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 22 Nov 2010 20:15:08 -0500 |
parents | a888cc87aa4f |
children |
line wrap: on
line source
/* XPM */ static char * letter_xpm[] = { "14 10 2 1", ". c opaque", " c None", "..............", "... ...", ". . . .", ". . . .", ". .... .", ". . .. . .", ". . . .", ". . . .", ".. ..", ".............."};