From 46e829ca2bd5b9adbdfd52066a1a059d1cfae039 Mon Sep 17 00:00:00 2001 From: marvinbernhardt Date: Wed, 6 Jun 2018 21:05:25 +0200 Subject: [PATCH] small change to help message --- README.md | 7 ++++--- syncthing-resolve-conflicts | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0e6595f..1937c70 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/syncthing-resolve-conflicts b/syncthing-resolve-conflicts index 92c5079..0e5c252 100755 --- a/syncthing-resolve-conflicts +++ b/syncthing-resolve-conflicts @@ -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