Mercurial > emacs
view etc/images/gnus/mail-reply.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 | 210af0ad3d35 |
children |
line wrap: on
line source
/* XPM */ static char * mail_reply_xpm[] = { "24 24 5 1", " c None", ". c #000000000000", "X c #E1E1E0E0E0E0", "O c #FFFFFFFFFFFF", "o c #C7C7C6C6C6C6", " .. ", " .X. ", " ..XX. ", " ......XoXX.. ", " ...OOO.XooXXX. ", " ..OOOO.XooXXX. ", " ...OOOOO.XooXXX... ", " ..OOOOOO.XXooXX.OO.. ", " ...OOOO.oooXXX...... ", " .O...O.oXooXXX...OO. ", " .OOO...oXoXX...OOOO. ", " .OOOOO...X...OOOOOO. ", " .OOOOO.O...OO.OOOOO. ", " .OOO..OOOOOOOO..OOO. ", " .OO.OOOOOOOOOOOO.OO. ", " .O.OOOOOOOOOOOOOO.O. ", " ..OOOOOOOOOOOOOOOO.. ", " .................... ", " ", " ", " ", " ", " ", " "};