Add --conflict auto option to online docs

2016-07-27 11:57:32 +08:00 · 2016-07-27 11:57:32 +08:00 · 269a14aa78
parent f5f910336b
commit 269a14aa78
1 changed files with 1 additions and 1 deletions
--- a/website/cli.html
+++ b/website/cli.html
@ -204,7 +204,7 @@
 						<tr>
 							<td>--conflict</td>
 							<td>conflict resolution</td>
-							<td>override | skip | index | fail</td>
+							<td>override | skip | auto | index | fail</td>
 						</tr>
 						<tr>
 							<td>--filter</td>