small change to help message

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

@ -22,11 +22,12 @@ if desired.
Locate is used to find conflicts. In case the database is not recent, run Locate is used to find conflicts. In case the database is not recent, run
'updatedb'. 'updatedb'.
Usage: syncthing-resolve-conflicts [-o] [--nocolor] Usage: syncthing-resolve-conflicts [-o] [-f] [--nocolor]
General Options: General Options:
-o/--output print files instead of merging them -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 --nocolor remove colors from output
-v/--version print version and exit -v/--version print version and exit
-h/--help print usage 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 Locate is used to find conflicts. In case the database is not recent, run
'updatedb'. 'updatedb'.
Usage: $myname [-o] [--nocolor] Usage: $myname [-o] [-f] [--nocolor]
General Options: General Options:
-o/--output print files instead of merging them -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 --nocolor remove colors from output
-v/--version print version and exit -v/--version print version and exit
-h/--help print usage and exit -h/--help print usage and exit

Loading…
Cancel
Save