Mercurial > hg > easyhg-kdiff3

view kdiff3/src-QT4/xpm/startmerge.xpm @ 111:44fa471eb3c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update for Qt5
author Chris Cannam
date Fri, 27 May 2016 14:16:02 +0100
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#......",
".......##......."};