equal
deleted
inserted
replaced
1643 # is this a jump, or a merge? i.e. is there a linear path |
1643 # is this a jump, or a merge? i.e. is there a linear path |
1644 # from p1 to p2? |
1644 # from p1 to p2? |
1645 linear_path = (pa == p1 or pa == p2) |
1645 linear_path = (pa == p1 or pa == p2) |
1646 |
1646 |
1647 if allow and linear_path: |
1647 if allow and linear_path: |
1648 raise util.Abort(_("there is nothing to merge, " |
1648 raise util.Abort(_("there is nothing to merge, just use " |
1649 "just use 'hg update'")) |
1649 "'hg update' or look at 'hg heads'")) |
1650 if allow and not forcemerge: |
1650 if allow and not forcemerge: |
1651 if modified or added or removed: |
1651 if modified or added or removed: |
1652 raise util.Abort(_("outstanding uncommitted changes")) |
1652 raise util.Abort(_("outstanding uncommitted changes")) |
1653 |
1653 |
1654 if not forcemerge and not force: |
1654 if not forcemerge and not force: |