@ -1,10 +1,10 @@
#!/usr/bin/env bash
# Check for sync conflicts and resolve them. Idea from the shell
# Check for sync conflicts and resolve them. Idea from the shell script
# script 'pacdiff'.
# 'pacdiff'.
declare -r myname='syncthing-resolve-conflicts'
declare -r myver='1.0.0'
declare -r myver='1.0.1'
diffprog=${DIFFPROG:-'vim -d'}
USE_COLOR='y'