Mercurial > emacs

view lisp/sb-pg-plus.xpm @ 47827:9d7b63dcf005

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-ediff): Autoload. (smerge-match-conflict): Don't assume as much about smerge-begin-re. (smerge-resolve-function): New var. (smerge-resolve): New command. (smerge-basic-map): Bind it.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 10 Oct 2002 17:30:20 +0000
parents b6a19b71d4b7
children c2a09ac7b7b1
line wrap: on
line source

/* XPM */
static char * sb_file+_xpm[] = {
"20 15 4 1",
" 	c None",
".	c #828282",
"+	c #000000",
"@	c #FFFFFF",
"       ............ ",
"      .++++++++++++.",
"     .++@@@@@@@@@@+.",
"    .+@+@@@@@@@@@@+.",
"   .+@@+@@@@@@@@@@+.",
"  .+@@@+@@@++@@@@@+.",
" .+@@@@+@@@++@@@@@+.",
".+++++++@++++++@@@+.",
".+@@@@@@@++++++@@@+.",
".+@@@@@@@@@++@@@@@+.",
".+@@@@@@@@@++@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".++++++++++++++++++.",
" .................. "};