equal
deleted
inserted
replaced
642 Differences between files are shown using the unified diff format. |
642 Differences between files are shown using the unified diff format. |
643 |
643 |
644 Note: |
644 Note: |
645 'hg diff' may generate unexpected results for merges, as it will |
645 'hg diff' may generate unexpected results for merges, as it will |
646 default to comparing against the working directory's first parent |
646 default to comparing against the working directory's first parent |
647 changeset if no revisions are specified. |
647 changeset if no revisions are specified. To diff against the conflict |
|
648 regions, you can use '--config diff.merge=yes'. |
648 |
649 |
649 By default, the working directory files are compared to its first parent. |
650 By default, the working directory files are compared to its first parent. |
650 To see the differences from another revision, use --from. To see the |
651 To see the differences from another revision, use --from. To see the |
651 difference to another revision, use --to. For example, 'hg diff --from .^' |
652 difference to another revision, use --to. For example, 'hg diff --from .^' |
652 will show the differences from the working copy's grandparent to the |
653 will show the differences from the working copy's grandparent to the |
975 Test list of internal help commands |
976 Test list of internal help commands |
976 |
977 |
977 $ hg help debug |
978 $ hg help debug |
978 debug commands (internal and unsupported): |
979 debug commands (internal and unsupported): |
979 |
980 |
|
981 debug-delta-find |
|
982 display the computation to get to a valid delta for storing REV |
980 debug-repair-issue6528 |
983 debug-repair-issue6528 |
981 find affected revisions and repair them. See issue6528 for more |
984 find affected revisions and repair them. See issue6528 for more |
982 details. |
985 details. |
|
986 debug-revlog-index |
|
987 dump index data for a revlog |
983 debugancestor |
988 debugancestor |
984 find the ancestor revision of two revisions in a given index |
989 find the ancestor revision of two revisions in a given index |
985 debugantivirusrunning |
990 debugantivirusrunning |
986 attempt to trigger an antivirus scanner to see if one is active |
991 attempt to trigger an antivirus scanner to see if one is active |
987 debugapplystreamclonebundle |
992 debugapplystreamclonebundle |
1011 debugdate parse and display a date |
1016 debugdate parse and display a date |
1012 debugdeltachain |
1017 debugdeltachain |
1013 dump information about delta chains in a revlog |
1018 dump information about delta chains in a revlog |
1014 debugdirstate |
1019 debugdirstate |
1015 show the contents of the current dirstate |
1020 show the contents of the current dirstate |
|
1021 debugdirstateignorepatternshash |
|
1022 show the hash of ignore patterns stored in dirstate if v2, |
1016 debugdiscovery |
1023 debugdiscovery |
1017 runs the changeset discovery protocol in isolation |
1024 runs the changeset discovery protocol in isolation |
1018 debugdownload |
1025 debugdownload |
1019 download a resource using Mercurial logic and config |
1026 download a resource using Mercurial logic and config |
1020 debugextensions |
1027 debugextensions |
1024 debugfsinfo show information detected about current filesystem |
1031 debugfsinfo show information detected about current filesystem |
1025 debuggetbundle |
1032 debuggetbundle |
1026 retrieves a bundle from a repo |
1033 retrieves a bundle from a repo |
1027 debugignore display the combined ignore pattern and information about |
1034 debugignore display the combined ignore pattern and information about |
1028 ignored files |
1035 ignored files |
1029 debugindex dump index data for a storage primitive |
|
1030 debugindexdot |
1036 debugindexdot |
1031 dump an index DAG as a graphviz dot file |
1037 dump an index DAG as a graphviz dot file |
1032 debugindexstats |
1038 debugindexstats |
1033 show stats related to the changelog index |
1039 show stats related to the changelog index |
1034 debuginstall test Mercurial installation |
1040 debuginstall test Mercurial installation |
1595 |
1601 |
1596 "usefncache" |
1602 "usefncache" |
1597 |
1603 |
1598 "use-dirstate-v2" |
1604 "use-dirstate-v2" |
1599 |
1605 |
|
1606 "use-dirstate-v2.automatic-upgrade-of-mismatching-repositories" |
|
1607 |
|
1608 "use-dirstate-v2.automatic-upgrade-of-mismatching-repositories:quiet" |
|
1609 |
1600 "use-dirstate-tracked-hint" |
1610 "use-dirstate-tracked-hint" |
1601 |
1611 |
|
1612 "use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories" |
|
1613 |
|
1614 "use-dirstate-tracked-hint.automatic-upgrade-of-mismatching-repositories:quiet" |
|
1615 |
1602 "use-persistent-nodemap" |
1616 "use-persistent-nodemap" |
1603 |
1617 |
1604 "use-share-safe" |
1618 "use-share-safe" |
|
1619 |
|
1620 "use-share-safe.automatic-upgrade-of-mismatching-repositories" |
|
1621 |
|
1622 "use-share-safe.automatic-upgrade-of-mismatching-repositories:quiet" |
1605 |
1623 |
1606 "usestore" |
1624 "usestore" |
1607 |
1625 |
1608 "sparse-revlog" |
1626 "sparse-revlog" |
1609 |
1627 |
1788 > This paragraph is omitted, |
1806 > This paragraph is omitted, |
1789 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension) |
1807 > if :hg:\`help\` is invoked without \`\`-v\`\` (for extension) |
1790 > |
1808 > |
1791 > This paragraph is never omitted, too (for extension) |
1809 > This paragraph is never omitted, too (for extension) |
1792 > ''' |
1810 > ''' |
1793 > from __future__ import absolute_import |
|
1794 > from mercurial import commands, help |
1811 > from mercurial import commands, help |
1795 > testtopic = br"""This paragraph is never omitted (for topic). |
1812 > testtopic = br"""This paragraph is never omitted (for topic). |
1796 > |
1813 > |
1797 > .. container:: verbose |
1814 > .. container:: verbose |
1798 > |
1815 > |