Rewording and clarifications

2020-09-29 14:20:22 +02:00
parent da96a314c0
commit e95dfc04bf
2 changed files with 20 additions and 15 deletions
--- a/assignment1/lit-test
+++ b/assignment1/lit-test
@@ -171,7 +171,7 @@ echo >>file1 "Sixth line added during merge conflict."
 # Before continuing we need to cleanup the leftover files.
 rm file1.r6 file1.r3

-lit commit # r7
+lit commit "Merge r6 into r5" # r7

 # Let's verify the final result.