diff options
| author | Todd Leonhardt <todd.leonhardt@gmail.com> | 2018-09-30 11:17:04 -0400 |
|---|---|---|
| committer | Todd Leonhardt <todd.leonhardt@gmail.com> | 2018-09-30 11:17:04 -0400 |
| commit | 81ad085cffc8f8af7fb7884bcc5db6fcede09df6 (patch) | |
| tree | a197a6c81767f10b62d6ac6acfd46e42357a8289 /tests/transcripts/from_cmdloop.txt | |
| parent | 85a21ef39467dc24a6f6f8c4f3ac656f24d6ff90 (diff) | |
| parent | 61d5703cd3586b3460669a6260cf903c9863b240 (diff) | |
| download | cmd2-git-81ad085cffc8f8af7fb7884bcc5db6fcede09df6.tar.gz | |
Merged master into transcript_fixes branch and resolved conflicts
Diffstat (limited to 'tests/transcripts/from_cmdloop.txt')
| -rw-r--r-- | tests/transcripts/from_cmdloop.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/transcripts/from_cmdloop.txt b/tests/transcripts/from_cmdloop.txt index e3ccbc5e..8c0dd007 100644 --- a/tests/transcripts/from_cmdloop.txt +++ b/tests/transcripts/from_cmdloop.txt @@ -5,8 +5,8 @@ Documented commands (type help <topic>): ======================================== -alias help load nothing py quit set shortcuts unalias/ */ -edit history mumble orate pyscript say shell speak/ */ +alias help load mumble orate pyscript say shell speak/ */ +edit history macro nothing py quit set shortcuts/ */ (Cmd) help say usage: speak [-h] [-p] [-s] [-r REPEAT]/ */ |