docs/src/delete-conflicts.md

Sat, 05 Aug 2017 13:35:27 +0200

author
Mike Becker <universe@uap-core.de>
date
Sat, 05 Aug 2017 13:35:27 +0200
changeset 282
3070d72f54af
parent 281
ddb5e8f2a43d
child 283
0e36bb75a732
permissions
-rw-r--r--

more minor improvements to the documentation

274
5577d3eae04c dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
1 dav-sync delete-conflicts
5577d3eae04c dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
2 ==========================
5577d3eae04c dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
3
5577d3eae04c dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
4 **`delete-conflicts <directory>`**
5577d3eae04c dav-sync command documentation complete
Olaf Wintermann <olaf.wintermann@gmail.com>
parents: 273
diff changeset
5
281
ddb5e8f2a43d some more minor doc improvements
Mike Becker <universe@uap-core.de>
parents: 274
diff changeset
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.
ddb5e8f2a43d some more minor doc improvements
Mike Becker <universe@uap-core.de>
parents: 274
diff changeset
7

mercurial