Show More
@@ -2809,7 +2809,7 b' def merge(ui, repo, node=None, **opts):' | |||||
2809 |
|
2809 | |||
2810 | ``--tool`` can be used to specify the merge tool used for file |
|
2810 | ``--tool`` can be used to specify the merge tool used for file | |
2811 | merges. It overrides the HGMERGE environment variable and your |
|
2811 | merges. It overrides the HGMERGE environment variable and your | |
2812 | configuration files. |
|
2812 | configuration files. See :hg:`help merge-tools` for options. | |
2813 |
|
2813 | |||
2814 | If no revision is specified, the working directory's parent is a |
|
2814 | If no revision is specified, the working directory's parent is a | |
2815 | head revision, and the current branch contains exactly one other |
|
2815 | head revision, and the current branch contains exactly one other |
General Comments 0
You need to be logged in to leave comments.
Login now