diff --git a/syncthing-resolve-conflicts b/syncthing-resolve-conflicts index 7e62bc5..c267beb 100755 --- a/syncthing-resolve-conflicts +++ b/syncthing-resolve-conflicts @@ -72,18 +72,20 @@ usage() { ${myname} v${myver} 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'. +'locate' (or 'find', see -f option) is used to find conflicts. In case the +database is not recent, run 'updatedb'. -Usage: $myname [-o] [-f] [--nocolor] +Usage: $myname [-d DIR] [-f] [-o] [--nocolor] General Options: - -o/--output print files instead of merging them - -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 + -d/--directory DIR only scan for sync conflicts in the directory DIR + -f/--find use find instead of locate; by default, scan the home + directory of the current user, but please see the -d + option + -o/--output print files instead of merging them + --nocolor remove colors from output + -v/--version print version and exit + -h/--help print usage and exit Environment Variables: DIFFPROG override the merge program: (default: 'vim -d')