Mercurial > emacs
view lisp/sb-tag-plus.xpm @ 29565:a5845156564d
(cvs-parse-table): Look for conflict markers in the
file to resolve the ambiguity between C-conflict and C-need-merge.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 11 Jun 2000 22:30:49 +0000 |
| parents | d6f40942e987 |
| children | c2a09ac7b7b1 |
line wrap: on
line source
/* XPM */ static char * sb_tag+_xpm[] = { "20 15 4 1", " c None", ". c #828282", "+ c #000000", "@ c #FFF993", " ", " ", " ............... ", " .+++++++++++++++.", " .+@@@@@@@@@@@@@@+.", " .+@@@@@@++@@@@@@@+.", ".+@@@@@@@++@@@@@@@+.", ".+@++@@++++++@@@@@+.", ".+@++@@++++++@@@@@+.", ".+@@@@@@@++@@@@@@@+.", " .+@@@@@@++@@@@@@@+.", " .+@@@@@@@@@@@@@@+.", ". .+++++++++++++++.", " ............... ", " "};