Fix merge problem

simple-backup

@@ -19,7 +19,7 @@
 
 #Help function
 function help_function {
-   echo "simple_backup, version 1.3.4"
+   echo "simple_backup, version 1.4"
    echo ""
    echo "Usage: $0 [OPTIONS]"
    echo ""
@@ -36,8 +36,8 @@ function help_function {
    echo "                                       Default: keep all."
    echo "-u, --user        USER                 User performing the backup."
    echo "                                       Default: current user."
-   echo "                                       WARNING: This currently doesn't work with"
-   echo "                                       other options!"
+   echo "-s, --checksum                         Use the checksum rsync option to compare files"
+   echo "                                       (MUCH slower)."
    echo ""
    echo "If no option is given, the program uses the default"
    echo "configuration file: $HOMEDIR/.simple_backup/config."
@@ -299,6 +299,10 @@ function parse_options {
             shift
             ;;
 
+         -s | --checksum)
+            OPTIONS="-arcv -H -X -R"
+            ;;            
+
          *)
             echo "$(date): Backup failed (see errors.log)" >> $LOG
             echo "Backup failed"