h44z/uibk_703807-Advanced-CXX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'patch-1' into 'master'

Browse Source 
Fix missing `-` in `lit-test` and fix typo.

See merge request c7031162/703807-advanced-cxx!1
This commit is contained in:
Alexander Hirsch 2020-10-23 13:29:24 +02:00
commit d17524a378
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assignment1/lit-test
View File

@ -109,7 +109,7 @@ echo "== Merging (no conflict)"
lit merge r3
# file2 should now be present.
diff -s subfolder/file2 <<-EOF
diff -s subfolder/file2 - <<-EOF
This is the first line of the second file.
And another line in the second file.
EOF
@ -152,7 +152,7 @@ diff -s file1 - <<-EOF
Fifth line on top of r4.
EOF
# other breanch
# other branch
diff -s file1.r6 - <<-EOF
This is the first line of the first file. 🚀
This is the second line of the first file.