Merge pull request #3 from junkblocker/master

Change name to remove .sh from the script

README.md

@@ -16,14 +16,14 @@ for removal.
 Non-text files are ignored at the moment and can be removed one by one
 if desired.
 
-    syncthing-resolve-conflicts.sh v1.0.0
+    syncthing-resolve-conflicts v1.0.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'.
 
-    Usage: syncthing-resolve-conflicts.sh [-o] [--nocolor]
+    Usage: syncthing-resolve-conflicts [-o] [--nocolor]
 
     General Options:
       -o/--output       print files instead of merging them
@@ -32,5 +32,5 @@ if desired.
     Environment Variables:
       DIFFPROG          override the merge program: (default: 'vim -d')
 
-    Example: DIFFPROG=meld syncthing-resolve-conflicts.sh
-    Example: syncthing-resolve-conflicts.sh --output
+    Example: DIFFPROG=meld syncthing-resolve-conflicts
+    Example: syncthing-resolve-conflicts --output

syncthing-resolve-conflicts

@@ -3,7 +3,7 @@
 # Check for sync conflicts and resolve them.  Idea from the shell
 # script 'pacdiff'.
 
-declare -r myname='syncthing-resolve-conflicts.sh'
+declare -r myname='syncthing-resolve-conflicts'
 declare -r myver='1.0.0'
 
 diffprog=${DIFFPROG:-'vim -d'}