equal
deleted
inserted
replaced
3847 elif currentbranchheads > 1: |
3847 elif currentbranchheads > 1: |
3848 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
3848 ui.status(_("(run 'hg heads .' to see heads, 'hg merge' to " |
3849 "merge)\n")) |
3849 "merge)\n")) |
3850 else: |
3850 else: |
3851 ui.status(_("(run 'hg heads' to see heads)\n")) |
3851 ui.status(_("(run 'hg heads' to see heads)\n")) |
3852 else: |
3852 elif not ui.configbool('commands', 'update.requiredest'): |
3853 ui.status(_("(run 'hg update' to get a working copy)\n")) |
3853 ui.status(_("(run 'hg update' to get a working copy)\n")) |
3854 |
3854 |
3855 @command('^pull', |
3855 @command('^pull', |
3856 [('u', 'update', None, |
3856 [('u', 'update', None, |
3857 _('update to new branch head if changesets were pulled')), |
3857 _('update to new branch head if changesets were pulled')), |