Show More
@@ -1882,7 +1882,7 b' def merge(ui, repo, node=None, force=Non' | |||||
1882 |
|
1882 | |||
1883 | if not node: |
|
1883 | if not node: | |
1884 | branch = repo.changectx(None).branch() |
|
1884 | branch = repo.changectx(None).branch() | |
1885 | bheads = repo.branchheads() |
|
1885 | bheads = repo.branchheads(branch) | |
1886 | if len(bheads) > 2: |
|
1886 | if len(bheads) > 2: | |
1887 | raise util.Abort(_("branch '%s' has %d heads - " |
|
1887 | raise util.Abort(_("branch '%s' has %d heads - " | |
1888 | "please merge with an explicit rev") % |
|
1888 | "please merge with an explicit rev") % |
General Comments 0
You need to be logged in to leave comments.
Login now