equal
deleted
inserted
replaced
1660 if f in merge: |
1660 if f in merge: |
1661 cf = _(" (resolve)") |
1661 cf = _(" (resolve)") |
1662 self.ui.status(" %s%s\n" % (f, cf)) |
1662 self.ui.status(" %s%s\n" % (f, cf)) |
1663 self.ui.warn(_("aborting update spanning branches!\n")) |
1663 self.ui.warn(_("aborting update spanning branches!\n")) |
1664 self.ui.status(_("(use 'hg merge' to merge across branches" |
1664 self.ui.status(_("(use 'hg merge' to merge across branches" |
1665 " or '-C' to lose changes)\n")) |
1665 " or 'hg update -C' to lose changes)\n")) |
1666 return 1 |
1666 return 1 |
1667 branch_merge = True |
1667 branch_merge = True |
1668 |
1668 |
1669 # get the files we don't need to change |
1669 # get the files we don't need to change |
1670 files = get.keys() |
1670 files = get.keys() |