merging conflict

This commit is contained in:
hugogogo
2021-12-17 19:28:55 +01:00
6 changed files with 243 additions and 219 deletions

View File

@@ -52,8 +52,6 @@ pwd
Echo
echo \\
exit 123 123 123
echo hi
@@ -106,199 +104,3 @@ exit 99
exit 3 a
exit 55 99
echo \poep
echo \1
echo 123\!456
echo 123\456
echo \a
echo \b
echo \c
echo \d
echo \e
echo \!
echo \"
echo \#
echo \$
echo \%
echo \&
echo \'
echo \(
echo \)
echo \*
echo \+
echo \,
echo \-
echo \.
echo \/
echo \0
echo \1
echo \2
echo \3
echo \4
echo \5
echo \6
echo \7
echo \8
echo \9
echo \:
echo \=
echo \?
echo \@
echo \A
echo \B
echo \C
echo \D
echo \E
echo \F
echo \G
echo \H
echo \I
echo \J
echo \K
echo \L
echo \M
echo \N
echo \O
echo \P
echo \Q
echo \R
echo \S
echo \T
echo \U
echo \V
echo \W
echo \X
echo \Y
echo \Z
echo \[
echo \\
echo \]
echo \^
echo \_
echo \a
echo \b
echo \c
echo \d
echo \e
echo \f
echo \g
echo \h
echo \i
echo \j
echo \k
echo \l
echo \m
echo \n
echo \o
echo \p
echo \q
echo \r
echo \s
echo \t
echo \u
echo \v
echo \w
echo \x
echo \y
echo \z
echo \{
echo \}
echo \~

View File

@@ -46,12 +46,8 @@ ls | ls | ls | ls | ls | ls /proc/self/fd
echo | cd .. | pwd
echo DOET HET NIET > test1 | cat test1
echo hallo >x1 >x2 >x3 | echo hoi
export | grep -e "HOME="
echo hallo daar | echo hoi maran
echo "test test" > working.txt
@@ -61,8 +57,6 @@ cat | cat -e | cat
ls filedoesnotexist | grep notme | echo "TEST"
export | grep -e "PWD="
echo hallo daar
echo hoi maran
echo hallo daar | echo hoi maran
@@ -80,14 +74,12 @@ echo hoi
echo hallo >x1 >x2 >x3 | echo hoi
echo hallo | echo poep >x1 >x2
echo hallo ; echo poep >x1 >x2
echo hallo | echo hoi | cat
echo hallo | echo hoi > y1 >y2 | cat -e
echo hoi > y1 >y2 ; cat -e
echo hallo | echo hoi > y1 >y2 ; cat -e
echo "hello | this is some stuff > touch this file" | grep more
echo hello | this is some stuff > touch this file | grep more

View File

@@ -19,14 +19,8 @@ ls
> a echo Hello World!
ls
echo bonjour > test\ 1
ls
echo bonjour >>> test
echo bonjour > > out
ls
echo 2 >> out1 > out2
ls