Show More
| @@ -5,7 +5,7 b'' | |||||
| 5 | # This software may be used and distributed according to the terms of the |
|
5 | # This software may be used and distributed according to the terms of the | |
| 6 | # GNU General Public License version 2 or any later version. |
|
6 | # GNU General Public License version 2 or any later version. | |
| 7 |
|
7 | |||
| 8 | '''pull, update and merge in one command''' |
|
8 | '''pull, update and merge in one command (DEPRECATED)''' | |
| 9 |
|
9 | |||
| 10 | from mercurial.i18n import _ |
|
10 | from mercurial.i18n import _ | |
| 11 | from mercurial.node import nullid, short |
|
11 | from mercurial.node import nullid, short | |
General Comments 0
You need to be logged in to leave comments.
Login now