clashes: more note about -fix-mode trash

ref: odeke-em#810
iblislin · Dec 19, 2016 · cdd274a · cdd274a
1 parent fa3d326
commit cdd274a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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"