small change to help message

master
marvinbernhardt 8 years ago
parent a92ef9bacb
commit 46e829ca2b
  1. 7
      README.md
  2. 5
      syncthing-resolve-conflicts

@ -17,16 +17,17 @@ Non-text files are ignored at the moment and can be removed one by one
if desired.
syncthing-resolve-conflicts v1.0.2
Inspired by 'pacdiff'. A simple program to merge or remove sync conflicts.
Locate is used to find conflicts. In case the database is not recent, run
'updatedb'.
Usage: syncthing-resolve-conflicts [-o] [--nocolor]
Usage: syncthing-resolve-conflicts [-o] [-f] [--nocolor]
General Options:
-o/--output print files instead of merging them
-f/--find use find instead of locate (scans only home directory)
-f/--find use find instead of locate; scans only the home directory
of the current user
--nocolor remove colors from output
-v/--version print version and exit
-h/--help print usage and exit

@ -74,11 +74,12 @@ Inspired by 'pacdiff'. A simple program to merge or remove sync conflicts.
Locate is used to find conflicts. In case the database is not recent, run
'updatedb'.
Usage: $myname [-o] [--nocolor]
Usage: $myname [-o] [-f] [--nocolor]
General Options:
-o/--output print files instead of merging them
-f/--find use find instead of locate (scans only home directory)
-f/--find use find instead of locate; scans only the home directory
of the current user
--nocolor remove colors from output
-v/--version print version and exit
-h/--help print usage and exit

Loading…
Cancel
Save