From cdd274a45959e5be2e250e22fbb402743e695447 Mon Sep 17 00:00:00 2001 From: Iblis Lin Date: Tue, 20 Dec 2016 01:10:59 +0800 Subject: [PATCH] clashes: more note about -fix-mode trash ref: #810 --- README.md | 2 +- src/clashes.go | 2 +- src/help.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 30851048..1dd5fb06 100644 --- a/README.md +++ b/README.md @@ -1083,7 +1083,7 @@ drive clashes -fix [-fix-mode mode] [-depth n] [paths...] There are two available modes for `-fix-mode`: * `rename`: this is the default behavior - * `trash` + * `trash`: trashing *both* new and old files ### Move diff --git a/src/clashes.go b/src/clashes.go index 9fcfae19..e7ad9e50 100644 --- a/src/clashes.go +++ b/src/clashes.go @@ -296,7 +296,7 @@ func autoTrashClashes(g *Commands, clashes []*Change) error { } if g.opts.canPrompt() { - g.log.Logln("Some clashes found, trash them?") + g.log.Logln("Some clashes found, trash them all?") for _, c := range clashes { g.log.Logln(c.Symbol(), c.Path, c.Dest.Id) } diff --git a/src/help.go b/src/help.go index 67c7c30c..5f35c043 100644 --- a/src/help.go +++ b/src/help.go @@ -179,7 +179,7 @@ const ( DescOpen = "open a file in the appropriate filemanager or default browser" DescUrl = "returns the remote URL of each file" DescVerbose = "show step by step information verbosely" - DescFixClashes = "fix clashes by renaming or trashing files" + DescFixClashes = "fix clashes by renaming or trashing all files" DescFixClashesMode = "set fix policy to rename or trash" DescListClashes = "list clashes" DescDescription = "set the description"