bump version, change readme

README.md

@@ -16,25 +16,26 @@ for removal.
 Non-text files are ignored at the moment and can be removed one by one
 if desired.
 
-    syncthing-resolve-conflicts v1.0.2
+    syncthing-resolve-conflicts v1.1.0
 
     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: syncthing-resolve-conflicts [-o] [-f] [--nocolor]
+    Usage: syncthing-resolve-conflicts [-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')
 
     Example: DIFFPROG=meld syncthing-resolve-conflicts
     Example: syncthing-resolve-conflicts --output
-

syncthing-resolve-conflicts

@@ -4,7 +4,7 @@
 # Linux.
 
 declare -r myname='syncthing-resolve-conflicts'
-declare -r myver='1.0.2'
+declare -r myver='1.1.0'
 
 diffprog=${DIFFPROG:-'vim -d'}
 USE_COLOR='y'