##// END OF EJS Templates
diff: update synopsis to use --from/--to instead of -r...
Martin von Zweigbergk -
r46722:4a0730b7 default
parent child Browse files
Show More
@@ -2456,15 +2456,15 b" def debugcomplete(ui, cmd=b'', **opts):"
2456 b'diff',
2456 b'diff',
2457 [
2457 [
2458 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2458 (b'r', b'rev', [], _(b'revision'), _(b'REV')),
2459 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV')),
2459 (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
2460 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV')),
2460 (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
2461 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2461 (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
2462 ]
2462 ]
2463 + diffopts
2463 + diffopts
2464 + diffopts2
2464 + diffopts2
2465 + walkopts
2465 + walkopts
2466 + subrepoopts,
2466 + subrepoopts,
2467 _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
2467 _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
2468 helpcategory=command.CATEGORY_FILE_CONTENTS,
2468 helpcategory=command.CATEGORY_FILE_CONTENTS,
2469 helpbasic=True,
2469 helpbasic=True,
2470 inferrepo=True,
2470 inferrepo=True,
@@ -629,7 +629,7 b' Test command without options'
629 (some details hidden, use --verbose to show complete help)
629 (some details hidden, use --verbose to show complete help)
630
630
631 $ hg help diff
631 $ hg help diff
632 hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
632 hg diff [OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...
633
633
634 diff repository (or selected files)
634 diff repository (or selected files)
635
635
@@ -666,8 +666,8 b' Test command without options'
666 options ([+] can be repeated):
666 options ([+] can be repeated):
667
667
668 -r --rev REV [+] revision
668 -r --rev REV [+] revision
669 --from REV revision to diff from
669 --from REV1 revision to diff from
670 --to REV revision to diff to
670 --to REV2 revision to diff to
671 -c --change REV change made by revision
671 -c --change REV change made by revision
672 -a --text treat all files as text
672 -a --text treat all files as text
673 -g --git use git extended diff format
673 -g --git use git extended diff format
General Comments 0
You need to be logged in to leave comments. Login now