diff: docs/src/delete-conflicts.md
docs/src/delete-conflicts.md
- changeset 281
- ddb5e8f2a43d
- parent 274
- 5577d3eae04c
- child 283
- 0e36bb75a732
--- a/docs/src/delete-conflicts.md Sat Aug 05 11:08:34 2017 +0200 +++ b/docs/src/delete-conflicts.md Sat Aug 05 11:33:17 2017 +0200 @@ -3,4 +3,5 @@ **`delete-conflicts <directory>`** -Deletes all files that are marked as a conflict. This will always delete files and does not move them to the trash directory. +Deletes all files that are marked as a conflict. This will always delete the files and does not move them to the trash directory. +
