comparison: docs/html/resolve-conflicts.html
docs/html/resolve-conflicts.html
- changeset 275
- fa48ab29abd2
- parent 273
- c743721d566f
- child 282
- 3070d72f54af
equal
deleted
inserted
replaced
| 274:5577d3eae04c | 275:fa48ab29abd2 |
|---|---|
| 62 </div> | 62 </div> |
| 63 </div> | 63 </div> |
| 64 | 64 |
| 65 <!-- begin content --> | 65 <!-- begin content --> |
| 66 <div class="content"> | 66 <div class="content"> |
| 67 | 67 <h1 id="dav-sync-resolve-conflicts">dav-sync resolve-conflicts</h1> |
| 68 <p><strong><code>resolve-conflicts <directory></code></strong></p> | |
| 69 <p>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.</p> | |
| 68 </div> | 70 </div> |
| 69 <!-- end content --> | 71 <!-- end content --> |
| 70 </body> | 72 </body> |
| 71 </html> | 73 </html> |
