Show More
@@ -3991,7 +3991,7 b' def merge(ui, repo, node=None, **opts):' | |||||
3991 | If no revision is specified, the working directory's parent is a |
|
3991 | If no revision is specified, the working directory's parent is a | |
3992 | head revision, and the current branch contains exactly one other |
|
3992 | head revision, and the current branch contains exactly one other | |
3993 | head, the other head is merged with by default. Otherwise, an |
|
3993 | head, the other head is merged with by default. Otherwise, an | |
3994 |
explicit revision with which to merge |
|
3994 | explicit revision with which to merge must be provided. | |
3995 |
|
3995 | |||
3996 | See :hg:`help resolve` for information on handling file conflicts. |
|
3996 | See :hg:`help resolve` for information on handling file conflicts. | |
3997 |
|
3997 |
General Comments 0
You need to be logged in to leave comments.
Login now