diff options
| author | Matthäus G. Chajdas <dev@anteru.net> | 2021-01-30 15:06:14 +0100 |
|---|---|---|
| committer | Matthäus G. Chajdas <dev@anteru.net> | 2021-01-30 15:06:14 +0100 |
| commit | a186efef569951c4f00d110c4c6659f902be3519 (patch) | |
| tree | 1116325e9fc86344d95d44c8d1d4517bf976db05 /tests/examplefiles/console | |
| parent | dab1998b313697ab94f391e63ea5a2ef7f46f073 (diff) | |
| parent | 2b1ee78a948fb8bdfad838fac82214128ec73c81 (diff) | |
| download | pygments-git-a186efef569951c4f00d110c4c6659f902be3519.tar.gz | |
Merge branch 'master' of https://github.com/mathiasertl/pygments into mathiasertl-master
Resolve conflicts, move tests to snippets, regenerate example files.
# Conflicts:
# tests/test_shell.py
Diffstat (limited to 'tests/examplefiles/console')
| -rw-r--r-- | tests/examplefiles/console/example.sh-session.output | 3 | ||||
| -rw-r--r-- | tests/examplefiles/console/example.shell-session.output | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/tests/examplefiles/console/example.sh-session.output b/tests/examplefiles/console/example.sh-session.output index 247da4be..c31fc193 100644 --- a/tests/examplefiles/console/example.sh-session.output +++ b/tests/examplefiles/console/example.sh-session.output @@ -35,8 +35,7 @@ ' ' Text '\\\n' Literal.String.Escape -'>' Text -' ' Text +'> ' Generic.Prompt 'a' Text '\n' Text diff --git a/tests/examplefiles/console/example.shell-session.output b/tests/examplefiles/console/example.shell-session.output index 91a018ac..b778132b 100644 --- a/tests/examplefiles/console/example.shell-session.output +++ b/tests/examplefiles/console/example.shell-session.output @@ -94,10 +94,7 @@ 'platform.' Text '\n' Text -'>' Generic.Prompt -' ' Text -'test' Name.Builtin -'\n' Text +'> test\n' Generic.Output '$ ' Generic.Prompt 'test' Name.Builtin |