equal
deleted
inserted
replaced
1938 head revision, and the repository contains exactly one other head, |
1938 head revision, and the repository contains exactly one other head, |
1939 the other head is merged with by default. Otherwise, an explicit |
1939 the other head is merged with by default. Otherwise, an explicit |
1940 revision to merge with must be provided. |
1940 revision to merge with must be provided. |
1941 """ |
1941 """ |
1942 |
1942 |
1943 if node: |
1943 if node or branch: |
1944 node = _lookup(repo, node, branch) |
1944 node = _lookup(repo, node, branch) |
1945 else: |
1945 else: |
1946 heads = repo.heads() |
1946 heads = repo.heads() |
1947 if len(heads) > 2: |
1947 if len(heads) > 2: |
1948 raise util.Abort(_('repo has %d heads - ' |
1948 raise util.Abort(_('repo has %d heads - ' |