From 269a14aa78a5412a4a7be059982723583cd819e3 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Wed, 27 Jul 2016 11:57:32 +0800
Subject: [PATCH] Add --conflict auto option to online docs

---
 website/cli.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/cli.html b/website/cli.html
index 71f9ed97..7e62c8e5 100644
--- 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>