docs/src/delete-conflicts.md

changeset 281
ddb5e8f2a43d
parent 274
5577d3eae04c
child 283
0e36bb75a732
equal deleted inserted replaced
280:6d8784bee427 281:ddb5e8f2a43d
1 dav-sync delete-conflicts 1 dav-sync delete-conflicts
2 ========================== 2 ==========================
3 3
4 **`delete-conflicts <directory>`** 4 **`delete-conflicts <directory>`**
5 5
6 Deletes all files that are marked as a conflict. This will always delete files and does not move them to the trash directory. 6 Deletes all files that are marked as a conflict. This will always delete the files and does not move them to the trash directory.
7

mercurial