From c478d1d8ab4ab42a79e97e5e16f6109434d58e19 Mon Sep 17 00:00:00 2001 From: Alex Hirsch Date: Tue, 29 Sep 2020 13:38:46 +0200 Subject: [PATCH] Clarify comments in code snippet --- assignment1/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assignment1/README.md b/assignment1/README.md index 1eb5895..d32d909 100644 --- a/assignment1/README.md +++ b/assignment1/README.md @@ -108,10 +108,10 @@ robot.c # currently checked out version. robot.c.r1 # version of the other branch robot.c.r0 # common base of both branches -# Manually resolving the merge conflict: +$ # Manually resolving the merge conflict: $ vimdiff robot.c robot.c.r1 robot.c.r0 -# Cleanup +$ # Cleanup $ rm robot.c.r1 robot.c.r0 $ lit commit