Mercurial > hg
view tests/test-debugcomplete.out @ 7785:660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 10 Feb 2009 22:47:38 +0100 |
parents | 92ccccb55ba3 |
children | 7ca2be800804 |
line wrap: on
line source
% Show all commands except debug commands add addremove annotate archive backout bisect branch branches bundle cat clone commit copy diff export grep heads help identify import incoming init locate log manifest merge outgoing parents paths pull push recover remove rename resolve revert rollback root serve showconfig status tag tags tip unbundle update verify version % Show all commands that start with "a" add addremove annotate archive % Do not show debug commands if there are other candidates diff % Show debug commands if there are no other candidates debugancestor debugcheckstate debugcomplete debugconfig debugdata debugdate debugfsinfo debugindex debugindexdot debuginstall debugrawcommit debugrebuildstate debugrename debugsetparents debugstate debugwalk % Do not show the alias of a debug command if there are other candidates % (this should hide rawcommit) recover remove rename resolve revert rollback root % Show the alias of a debug command if there are no other candidates rawcommit % Show the global options --config --cwd --debug --debugger --encoding --encodingmode --help --lsprof --noninteractive --profile --quiet --repository --time --traceback --verbose --version -R -h -q -v -y % Show the options for the "serve" command --accesslog --address --certificate --config --cwd --daemon --daemon-pipefds --debug --debugger --encoding --encodingmode --errorlog --help --ipv6 --lsprof --name --noninteractive --pid-file --port --prefix --profile --quiet --repository --stdio --style --templates --time --traceback --verbose --version --webdir-conf -6 -A -E -R -a -d -h -n -p -q -t -v -y % Show an error if we use --options with an ambiguous abbreviation hg: command 's' is ambiguous: serve showconfig status