From 54d6eb61347696351610a65edfbe6dd4fe78ea8d Mon Sep 17 00:00:00 2001 From: Alex Hirsch Date: Tue, 29 Sep 2020 13:37:04 +0200 Subject: [PATCH] Rewording --- assignment1/README.md | 2 +- assignment1/lit-test | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/assignment1/README.md b/assignment1/README.md index 9828b11..1eb5895 100644 --- a/assignment1/README.md +++ b/assignment1/README.md @@ -5,7 +5,7 @@ In this first assignment you are tasked to create a very basic version control system (VCS) similar to [Git](https://git-scm.com/) or [Mercurial](https://www.mercurial-scm.org/). For this assignment you are *not* allowed to work in teams. -You are not allowed to use code from other people participating in this course. +You are *not* allowed to use code from other people participating in this course. Always state the origin of non-original code and ideas. It is recommend to be familiar Git to understand the intensions behind the following commands. diff --git a/assignment1/lit-test b/assignment1/lit-test index 5425bc4..3db42aa 100755 --- a/assignment1/lit-test +++ b/assignment1/lit-test @@ -119,11 +119,11 @@ EOF lit log echo "== Setting up a conflict" -echo >>file1 "Fifth line ontop of r4." +echo >>file1 "Fifth line on top of r4." lit commit "Extend file1 one way" # r5 lit checkout r3 -echo >>file1 "Third line ontop of r3." +echo >>file1 "Third line on top of r3." lit commit "Extend file1 another way" # r6 # o ← r6 Extend file1 another way @@ -146,14 +146,14 @@ diff -s file1 - <<-EOF This is the second line of the first file. A third line is added to the first file. A forth line is added. - Fifth line ontop of r4. + Fifth line on top of r4. EOF # other breanch diff -s file1.r6 - <<-EOF This is the first line of the first file. 🚀 This is the second line of the first file. - Third line ontop of r3. + Third line on top of r3. EOF # common base