Add --conflict auto option to online docs
This commit is contained in:
parent
f5f910336b
commit
269a14aa78
|
@ -204,7 +204,7 @@
|
||||||
<tr>
|
<tr>
|
||||||
<td>--conflict</td>
|
<td>--conflict</td>
|
||||||
<td>conflict resolution</td>
|
<td>conflict resolution</td>
|
||||||
<td>override | skip | index | fail</td>
|
<td>override | skip | auto | index | fail</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>--filter</td>
|
<td>--filter</td>
|
||||||
|
|
Loading…
Reference in New Issue