From 45a81d8927b1fbd33facf54428659df298ea3a8e Mon Sep 17 00:00:00 2001
From: Alex Hirsch <w4rh4wk@bluephoenix.at>
Date: Mon, 9 Nov 2020 23:28:16 +0100
Subject: [PATCH] Assignment 1: Change example graph format to be less
 ambiguous

---
 assignment1/README.md |  8 ++++----
 assignment1/lit-test  | 46 +++++++++++++++++++++----------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/assignment1/README.md b/assignment1/README.md
index 37c39c4..706ef8a 100644
--- a/assignment1/README.md
+++ b/assignment1/README.md
@@ -140,10 +140,10 @@ You don't have to follow the exact format of this example:
 
 ```
 $ lit log
-o─┐ ← r3 "Merge r2 with r1"
-│ o   r2 "Add chocolate egg dispenser"
-o │   r1 "Add coin operated self destruct feature"
-o─┘   r0 "First Commit"
+o←┐  ← r3 "Merge r2 with r1"
+│ └o   r2 "Add chocolate egg dispenser"
+o  │   r1 "Add coin operated self destruct feature"
+o──┘   r0 "First Commit"
 ```
 
 ## Implementation
diff --git a/assignment1/lit-test b/assignment1/lit-test
index e00ac4c..341196e 100755
--- a/assignment1/lit-test
+++ b/assignment1/lit-test
@@ -91,9 +91,9 @@ EOF
 # This should be r3.
 lit commit "Add file2"
 
-# o   ← r3 Add file2
-# │ o   r2 Extend file1 even further
-# │ o   r1 Extend file1
+#   o ← r3 Add file2
+# o │   r2 Extend file1 even further
+# o │   r1 Extend file1
 # o─┘   r0 Add file1
 lit log
 
@@ -114,11 +114,11 @@ diff -s subfolder/file2 - <<-EOF
 	And another line in the second file.
 EOF
 
-# o─┐ ← r4 Merge r3 into r2
-# │ o   r3 Add file2
-# o │   r2 Extend file1 even further
-# o │   r1 Extend file1
-# o─┘   r0 Add file1
+# o←┐  ← r4 Merge r3 into r2
+# │ └o   r3 Add file2
+# o  │   r2 Extend file1 even further
+# o  │   r1 Extend file1
+# o──┘   r0 Add file1
 lit log
 
 echo "== Setting up a conflict"
@@ -129,13 +129,13 @@ lit checkout r3
 echo >>file1 "Third line on top of r3."
 lit commit "Extend file1 another way" # r6
 
-#   o ← r6 Extend file1 another way
-# o │   r5 Extend file1 one way
-# o─┤   r4 Merge r3 into r2
-# │ o   r3 Add file2
-# o │   r2 Extend file1 even further
-# o │   r1 Extend file1
-# o─┘   r0 Add file1
+#    o ← r6 Extend file1 another way
+# o  │   r5 Extend file1 one way
+# o←┐│   r4 Merge r3 into r2
+# │ └o   r3 Add file2
+# o  │    r2 Extend file1 even further
+# o  │    r1 Extend file1
+# o──┘    r0 Add file1
 lit log
 
 # Going back and merging.
@@ -184,14 +184,14 @@ diff -s file1 - <<-EOF
 	Sixth line added during merge conflict.
 EOF
 
-# o─┐ ← r7 Merge r6 into r5
-# │ o   r6 Extend file1 another way
-# o │   r5 Extend file1 one way
-# o─┤   r4 Merge r3 into r2
-# │ o   r3 Add file2
-# o │   r2 Extend file1 even further
-# o │   r1 Extend file1
-# o─┘   r0 Add file1
+# o←┐   ← r7 Merge r6 into r5
+# │ └─o   r6 Extend file1 another way
+# o   │   r5 Extend file1 one way
+# o←┐ │   r4 Merge r3 into r2
+# │ └─o   r3 Add file2
+# o   │   r2 Extend file1 even further
+# o   │   r1 Extend file1
+# o───┘   r0 Add file1
 lit log
 
 echo "== Cleanup"