comparison: docs/html/resolve-conflicts.html
docs/html/resolve-conflicts.html
- changeset 285
- 02d3e4b1245f
- parent 283
- 0e36bb75a732
- child 320
- 12ed560c926c
equal
deleted
inserted
replaced
| 284:8e7ef0675946 | 285:02d3e4b1245f |
|---|---|
| 8 <style type="text/css">code{white-space: pre;}</style> | 8 <style type="text/css">code{white-space: pre;}</style> |
| 9 <link rel="stylesheet" href="davdoc.css" type="text/css" /> | 9 <link rel="stylesheet" href="davdoc.css" type="text/css" /> |
| 10 </head> | 10 </head> |
| 11 <body> | 11 <body> |
| 12 <div class="header"> | 12 <div class="header"> |
| 13 <span>davutils documentation</span> | 13 <a href="./index.html"><span>DavUtils documentation</span></a> |
| 14 </div> | 14 </div> |
| 15 <div class="sidebar"> | 15 <div class="sidebar"> |
| 16 <div class="nav"> | 16 <div class="nav"> |
| 17 <h3>dav</h3> | 17 <h3>dav</h3> |
| 18 <ul> | 18 <ul> |
| 65 <!-- begin content --> | 65 <!-- begin content --> |
| 66 <div class="content"> | 66 <div class="content"> |
| 67 <div id="header"> | 67 <div id="header"> |
| 68 <h1 class="title">dav-sync resolve-conflicts</h1> | 68 <h1 class="title">dav-sync resolve-conflicts</h1> |
| 69 </div> | 69 </div> |
| 70 <p><strong><code>resolve-conflicts <directory></code></strong></p> | 70 <p><strong><code>dav-sync resolve-conflicts <directory></code></strong></p> |
| 71 <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. In other words: by executing this command you assert that <em>you</em> have resolved the conflicts.</p> | 71 <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. In other words: by executing this command you assert that <em>you</em> have resolved the conflicts.</p> |
| 72 </div> | 72 </div> |
| 73 <!-- end content --> | 73 <!-- end content --> |
| 74 </body> | 74 </body> |
| 75 </html> | 75 </html> |
