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

Clarify comments in code snippet

Browse Source
This commit is contained in:
Alex Hirsch 2020-09-29 13:38:46 +02:00
parent 54d6eb6134
commit c478d1d8ab
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/README.md
View File

@ -108,10 +108,10 @@ robot.c # currently checked out version.
robot.c.r1 # version of the other branch robot.c.r1 # version of the other branch
robot.c.r0 # common base of both branches 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 $ vimdiff robot.c robot.c.r1 robot.c.r0
# Cleanup $ # Cleanup
$ rm robot.c.r1 robot.c.r0 $ rm robot.c.r1 robot.c.r0
$ lit commit $ lit commit