From 62a9dfb386e8c614ad0fc47bb679a4f8ee19e6d6 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Wed, 3 Feb 2016 18:14:44 +0000 Subject: [PATCH] + support --conflict index option --- source/net/filebot/cli/ArgumentBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/net/filebot/cli/ArgumentBean.java b/source/net/filebot/cli/ArgumentBean.java index da803a00..d96e3dd2 100644 --- a/source/net/filebot/cli/ArgumentBean.java +++ b/source/net/filebot/cli/ArgumentBean.java @@ -39,7 +39,7 @@ public class ArgumentBean { @Option(name = "--action", usage = "Rename action", metaVar = "[Move, Copy, Keeplink, Symlink, Hardlink, Test]") public String action = "move"; - @Option(name = "--conflict", usage = "Conflict resolution", metaVar = "[skip, override, auto, fail]") + @Option(name = "--conflict", usage = "Conflict resolution", metaVar = "[skip, override, auto, index, fail]") public String conflict = "skip"; @Option(name = "--filter", usage = "Filter expression", metaVar = "expression")