##// END OF EJS Templates
graft: minor copyediting of the help text for the `--to` argument...
Matt Harbison -
r53414:700086cf default
parent child Browse files
Show More
@@ -2975,7 +2975,7 def forget(ui, repo, *pats, **opts):
2975 b'',
2975 b'',
2976 b'to',
2976 b'to',
2977 b'',
2977 b'',
2978 _(b'graft to this destination, in memory (EXPERIMENTAL)'),
2978 _(b'graft to this destination, in-memory (EXPERIMENTAL)'),
2979 ),
2979 ),
2980 (b'c', b'continue', False, _(b'resume interrupted graft')),
2980 (b'c', b'continue', False, _(b'resume interrupted graft')),
2981 (b'', b'stop', False, _(b'stop interrupted graft')),
2981 (b'', b'stop', False, _(b'stop interrupted graft')),
@@ -3067,13 +3067,13 def graft(ui, repo, *revs, **opts):
3067
3067
3068 .. container:: verbose
3068 .. container:: verbose
3069
3069
3070 The experimental --to option allow to graft a revision in memory,
3070 The experimental --to option allows grafting a revision in-memory,
3071 independently from the working copy. Merge conflict are not currenly
3071 independent of the working copy. Merge conflicts are not currently
3072 supported and the operation will be aborted if the configured tool
3072 supported, and the operation will be aborted if the configured tool
3073 cannot handle the conflict that might be encountered.
3073 cannot handle the conflicts that might be encountered.
3074
3074
3075 As the operation is performence in memory, the on disk file will not be
3075 As the operation is performed in-memory, the on-disk files will not be
3076 modified and some hooks might not be run.
3076 modified, and some hooks might not be run.
3077
3077
3078 .. container:: verbose
3078 .. container:: verbose
3079
3079
General Comments 0
You need to be logged in to leave comments. Login now