Mercurial > hg > easyhg-kdiff3

view kdiff3/src-QT4/xpm/startmerge.xpm @ 102:4bac4535ea7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Corrected handling of unicode arguments, especially filenames
author joachim99
date Thu, 02 Sep 2010 20:27:45 +0000
parents 08ea9b86c12c
children
line wrap: on
line source
/* XPM */
static const char *startmerge[]={
"16 16 6 1",
". c None",
"# c #000000",
"b c #0000ff",
"c c #00ffff",
"d c #ff0000",
"a c #ffff00",
".......##.......",
"......#aa#......",
"......#aa#......",
"...b.b.##.b.b...",
"...bb......bb...",
"...bbb....bbb...",
".##..........##.",
"#cc#........#cc#",
"#cc#........#cc#",
".##.b.b..b.b.##.",
".....bb..bb.....",
"....bbb..bbb....",
".......##.......",
"......#dd#......",
"......#dd#......",
".......##......."};