Mercurial > emacs
annotate etc/images/low-color/copy.xpm @ 111679:33ed3cf8260b
Initial support for unified DVCS pull and merge.
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.
* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available. Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 22 Nov 2010 20:15:08 -0500 |
parents | 45a69ccc2f35 |
children |
rev | line source |
---|---|
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
1 /* XPM */ |
66732 | 2 static char * copy_xpm[] = { |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
3 "24 24 6 1", |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
4 " c None", |
66732 | 5 ". c #000100", |
6 "+ c #BBBDBA", | |
7 "@ c #FFFFFF", | |
8 "# c #6B6B66", | |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
9 "$ c #504D46", |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
10 " ", |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
11 " ", |
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
12 " ", |
66732 | 13 "............. ", |
14 ".+@@@@@@@@@@+. ", | |
15 ".@@@@@@@@@@@@. ", | |
16 ".@+###@+#@#+@. ", | |
17 ".@@@@@@@@@@@@. ", | |
18 ".@#$@##+@............ ", | |
19 ".@@@@@@@.+@@@@@@@@@@+. ", | |
20 ".@+##@##.@@@@@@@@@@@@. ", | |
21 ".@@@@@@@.@+##+@+#@#+@. ", | |
22 ".@#$$@##.@@@@@@@@@@@@. ", | |
23 ".@@@@@@@.@##@##+@+#@@. ", | |
24 ".@+##@##.@@@@@@@@@@@@. ", | |
25 ".@@@@@@@.@+##@##+@+#@. ", | |
26 ".+@@@@@@.@@@@@@@@@@@@. ", | |
27 " ........@###@##+@+#@. ", | |
28 " .@@@@@@@@@@@@. ", | |
29 " .@+##@##+@+#@. ", | |
30 " .@@@@@@@@@@@@. ", | |
31 " .+@@@@@@@@@@+. ", | |
32 " .............. ", | |
66168
28718fa5d988
Moved all remaining images from lisp/toolbar to etc/images, moved
Bill Wohler <wohler@newt.com>
parents:
diff
changeset
|
33 " "}; |