view etc/images/gnus/next-ur.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.

/* XPM */
static char * next_ur_xpm[] = {
"24 24 8 1",
".	c None",
" 	c #000000000000",
"X	c #A5A5A5A59595",
"o	c #C7C7C6C6C6C6",
"O	c #FFFF00000000",
"+	c #9A9A6C6C4E4E",
"@	c #E1E1E0E0E0E0",
"#	c #FFFFFFFFFFFF",
" .. .. .. .. .. .. .. ..",
"........................",
"............X...........",
" .. .. .. .XXX. .. .. ..",
".........XXooOX.........",
".......XXooo+O@X........",
" .. XXXoooo++@@@X. .. ..",
"....X@Xoooooo@@@X.......",
"....X@@Xooo@@@@@@X......",
" .. X@@XXoo@@@@@@@X.. ..",
"....X@@Xoo@@@@@@@@@X....",
"....X@Xo@@@XX@@@@@@oX...",
" .. oXoo@XXooO@@@@@@X ..",
"....oXoXXooo+OX@@@@Xo...",
"....XXXoooo++@@X@@Xo....",
" .. X@Xoooooo@@@XX .. ..",
"....X@@Xooo@@@@@@X......",
"....X@@XXoo@@@@@@@X.....",
" .. X@@Xoo@@@@@@@@@X. ..",
"....X@Xo@  @@@@@@@  X...",
"... oXoo ## @@ @@ ## ...",
" .. oXo ####  @  #### ..",
".....oX #### @@@ #### ..",
".....oX@ ## @@@@X ## ..."};