diff -r ddb5e8f2a43d -r 3070d72f54af docs/src/resolve-conflicts.md
--- a/docs/src/resolve-conflicts.md	Sat Aug 05 11:33:17 2017 +0200
+++ b/docs/src/resolve-conflicts.md	Sat Aug 05 13:35:27 2017 +0200
@@ -4,4 +4,5 @@
 **`resolve-conflicts <directory>`**
 
 Removes conflict entries from the database. This does not merge any files. All files which are marked as conflict are normal files after running this command.
+In other words: by executing this command you assert that *you* have resolved the conflicts.