Show More
@@ -2742,18 +2742,19 b' table = {' | |||||
2742 | ('r', 'rev', '', _('revision to backout')), |
|
2742 | ('r', 'rev', '', _('revision to backout')), | |
2743 | ] + walkopts + commitopts + commitopts2, |
|
2743 | ] + walkopts + commitopts + commitopts2, | |
2744 | _('hg backout [OPTION]... [-r] REV')), |
|
2744 | _('hg backout [OPTION]... [-r] REV')), | |
2745 |
"bisect": |
|
2745 | "bisect": | |
2746 | [('r', 'reset', False, _('reset bisect state')), |
|
2746 | (bisect, | |
2747 |
|
|
2747 | [('r', 'reset', False, _('reset bisect state')), | |
2748 |
|
|
2748 | ('g', 'good', False, _('mark changeset good')), | |
2749 |
|
|
2749 | ('b', 'bad', False, _('mark changeset bad')), | |
2750 |
|
|
2750 | ('s', 'skip', False, _('skip testing changeset')), | |
2751 | _("hg bisect [-gbsr] [REV]")), |
|
2751 | ('U', 'noupdate', False, _('do not update to target'))], | |
|
2752 | _("hg bisect [-gbsr] [REV]")), | |||
2752 | "branch": |
|
2753 | "branch": | |
2753 | (branch, |
|
2754 | (branch, | |
2754 | [('f', 'force', None, |
|
2755 | [('f', 'force', None, | |
2755 | _('set branch name even if it shadows an existing branch'))], |
|
2756 | _('set branch name even if it shadows an existing branch'))], | |
2756 | _('hg branch [NAME]')), |
|
2757 | _('hg branch [-f] [NAME]')), | |
2757 | "branches": |
|
2758 | "branches": | |
2758 | (branches, |
|
2759 | (branches, | |
2759 | [('a', 'active', False, |
|
2760 | [('a', 'active', False, | |
@@ -2890,7 +2891,8 b' table = {' | |||||
2890 | ('', 'import-branch', None, |
|
2891 | ('', 'import-branch', None, | |
2891 | _('Use any branch information in patch (implied by --exact)'))] + commitopts, |
|
2892 | _('Use any branch information in patch (implied by --exact)'))] + commitopts, | |
2892 | _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')), |
|
2893 | _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')), | |
2893 |
"incoming|in": |
|
2894 | "incoming|in": | |
|
2895 | (incoming, | |||
2894 | [('M', 'no-merges', None, _('do not show merges')), |
|
2896 | [('M', 'no-merges', None, _('do not show merges')), | |
2895 | ('f', 'force', None, |
|
2897 | ('f', 'force', None, | |
2896 | _('run even when remote repository is unrelated')), |
|
2898 | _('run even when remote repository is unrelated')), | |
@@ -2936,15 +2938,18 b' table = {' | |||||
2936 | ('', 'template', '', _('display with template')), |
|
2938 | ('', 'template', '', _('display with template')), | |
2937 | ] + walkopts, |
|
2939 | ] + walkopts, | |
2938 | _('hg log [OPTION]... [FILE]')), |
|
2940 | _('hg log [OPTION]... [FILE]')), | |
2939 | "manifest": (manifest, [('r', 'rev', '', _('revision to display'))], |
|
2941 | "manifest": | |
2940 | _('hg manifest [-r REV]')), |
|
2942 | (manifest, | |
|
2943 | [('r', 'rev', '', _('revision to display'))], | |||
|
2944 | _('hg manifest [-r REV]')), | |||
2941 | "^merge": |
|
2945 | "^merge": | |
2942 | (merge, |
|
2946 | (merge, | |
2943 | [('f', 'force', None, _('force a merge with outstanding changes')), |
|
2947 | [('f', 'force', None, _('force a merge with outstanding changes')), | |
2944 | ('r', 'rev', '', _('revision to merge')), |
|
2948 | ('r', 'rev', '', _('revision to merge')), | |
2945 | ], |
|
2949 | ], | |
2946 | _('hg merge [-f] [[-r] REV]')), |
|
2950 | _('hg merge [-f] [[-r] REV]')), | |
2947 |
"outgoing|out": |
|
2951 | "outgoing|out": | |
|
2952 | (outgoing, | |||
2948 | [('M', 'no-merges', None, _('do not show merges')), |
|
2953 | [('M', 'no-merges', None, _('do not show merges')), | |
2949 | ('f', 'force', None, |
|
2954 | ('f', 'force', None, | |
2950 | _('run even when remote repository is unrelated')), |
|
2955 | _('run even when remote repository is unrelated')), |
General Comments 0
You need to be logged in to leave comments.
Login now