Mercurial > emacs
view lisp/sb-pg-minus.xpm @ 47209:f06f993cfd92
(smerge-diff-buffer-name): Default to *vc-diff*.
(smerge-combine-with-next): New function.
(smerge-diff): Don't output `wrote /tmp/foo' messages.
Insert message if no diffs were found.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 03 Sep 2002 01:20:20 +0000 |
| parents | 13b33ab9d0b5 |
| 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", " ............ ", " .++++++++++++.", " .++@@@@@@@@@@+.", " .+@+@@@@@@@@@@+.", " .+@@+@@@@@@@@@@+.", " .+@@@+@@@@@@@@@@+.", " .+@@@@+@@@@@@@@@@+.", ".+++++++@++++++@@@+.", ".+@@@@@@@++++++@@@+.", ".+@@@@@@@@@@@@@@@@+.", ".+@@@@@@@@@@@@@@@@+.", ".+@@@@@@@@@@@@@@@@+.", ".+@@@@@@@@@@@@@@@@+.", ".++++++++++++++++++.", " .................. "};