From 99fe87a72a8583c17eca92c05c444a47c090dd16 Mon Sep 17 00:00:00 2001
From: Alex Hirsch <w4rh4wk@bluephoenix.at>
Date: Fri, 13 Nov 2020 13:22:34 +0100
Subject: [PATCH] Assignment 1: Clarify automatic creation of merge commits on
 no conflicts

---
 assignment1/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assignment1/README.md b/assignment1/README.md
index 0df6a76..51a891a 100644
--- a/assignment1/README.md
+++ b/assignment1/README.md
@@ -132,6 +132,8 @@ $ lit commit 'Merge r21 into r20'
 To complete the merge after manually resolving a conflict, invoke the `commit` sub-command.
 To abort the merge, use `checkout`.
 
+If no conflict is encountered, a merge commit is automatically created.
+
 ### `lit log`
 
 Displays a graph of all commits, one line per commit.