3259 _('skip check for outstanding uncommitted changes')), |
3259 _('skip check for outstanding uncommitted changes')), |
3260 ('', 'no-commit', None, _("don't commit, just update the working directory")), |
3260 ('', 'no-commit', None, _("don't commit, just update the working directory")), |
3261 ('', 'exact', None, |
3261 ('', 'exact', None, |
3262 _('apply patch to the nodes from which it was generated')), |
3262 _('apply patch to the nodes from which it was generated')), |
3263 ('', 'import-branch', None, |
3263 ('', 'import-branch', None, |
3264 _('Use any branch information in patch (implied by --exact)'))] + |
3264 _('use any branch information in patch (implied by --exact)'))] + |
3265 commitopts + commitopts2 + similarityopts, |
3265 commitopts + commitopts2 + similarityopts, |
3266 _('[OPTION]... PATCH...')), |
3266 _('[OPTION]... PATCH...')), |
3267 "incoming|in": |
3267 "incoming|in": |
3268 (incoming, |
3268 (incoming, |
3269 [('f', 'force', None, |
3269 [('f', 'force', None, |