Show More
@@ -2993,9 +2993,7 b' table = {' | |||||
2993 | "merge": |
|
2993 | "merge": | |
2994 | (merge, |
|
2994 | (merge, | |
2995 | [('b', 'branch', '', _('merge with head of a specific branch')), |
|
2995 | [('b', 'branch', '', _('merge with head of a specific branch')), | |
2996 | ('', 'style', '', _('display using template map file')), |
|
2996 | ('f', 'force', None, _('force a merge with outstanding changes'))], | |
2997 | ('f', 'force', None, _('force a merge with outstanding changes')), |
|
|||
2998 | ('', 'template', '', _('display with template'))], |
|
|||
2999 | _('hg merge [-b TAG] [-f] [REV]')), |
|
2997 | _('hg merge [-b TAG] [-f] [REV]')), | |
3000 | "outgoing|out": (outgoing, |
|
2998 | "outgoing|out": (outgoing, | |
3001 | [('M', 'no-merges', None, _('do not show merges')), |
|
2999 | [('M', 'no-merges', None, _('do not show merges')), | |
@@ -3122,11 +3120,9 b' table = {' | |||||
3122 | "^update|up|checkout|co": |
|
3120 | "^update|up|checkout|co": | |
3123 | (update, |
|
3121 | (update, | |
3124 | [('b', 'branch', '', _('checkout the head of a specific branch')), |
|
3122 | [('b', 'branch', '', _('checkout the head of a specific branch')), | |
3125 | ('', 'style', '', _('display using template map file')), |
|
|||
3126 | ('m', 'merge', None, _('allow merging of branches')), |
|
3123 | ('m', 'merge', None, _('allow merging of branches')), | |
3127 | ('C', 'clean', None, _('overwrite locally modified files')), |
|
3124 | ('C', 'clean', None, _('overwrite locally modified files')), | |
3128 | ('f', 'force', None, _('force a merge with outstanding changes')), |
|
3125 | ('f', 'force', None, _('force a merge with outstanding changes'))], | |
3129 | ('', 'template', '', _('display with template'))], |
|
|||
3130 | _('hg update [-b TAG] [-m] [-C] [-f] [REV]')), |
|
3126 | _('hg update [-b TAG] [-m] [-C] [-f] [REV]')), | |
3131 | "verify": (verify, [], _('hg verify')), |
|
3127 | "verify": (verify, [], _('hg verify')), | |
3132 | "version": (show_version, [], _('hg version')), |
|
3128 | "version": (show_version, [], _('hg version')), |
General Comments 0
You need to be logged in to leave comments.
Login now