From 13bfbd9d6174cd127cf289be65162cb5d3e8a605 Mon Sep 17 00:00:00 2001
From: Dominik Schrempf <dominik.schrempf@gmail.com>
Date: Wed, 30 May 2018 18:54:08 +0200
Subject: [PATCH] Improve help.

---
 syncthing-resolve-conflicts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/syncthing-resolve-conflicts b/syncthing-resolve-conflicts
index ca229f2..6fc2a69 100755
--- a/syncthing-resolve-conflicts
+++ b/syncthing-resolve-conflicts
@@ -69,16 +69,17 @@ usage() {
     cat <<EOF
 ${myname} v${myver}
 
-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'.
+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]
 
 General Options:
   -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')
@@ -90,8 +91,8 @@ EOF
 }
 
 version() {
-    printf "%s %s\n" "$myname" "$myver"
-    echo 'Copyright (C) 2017 Dominik Schrempf <dominik.schrempf@gmail.com>'
+    printf "%s %s\\n" "$myname" "$myver"
+    echo 'Copyright (C) 2018 Dominik Schrempf <dominik.schrempf@gmail.com>'
     echo 'Inspired by "pacdiff".'
 }
 
@@ -169,8 +170,8 @@ while IFS= read -u 3 -r -d '' conflict; do
         continue
     fi
 
-    # XXX: Recursive sync conflicts lead to problems if they are
-    # treated in the wrong order.
+    # XXX: Recursive sync conflicts lead to problems if they are treated in the
+    # wrong order.
 
     # TODO: Improve pattern match (digits only).