From 447fe242f5d9b1d09ac790716324c2f0a290c358 Mon Sep 17 00:00:00 2001
From: Dominik Schrempf <dominik.schrempf@gmail.com>
Date: Fri, 12 May 2017 22:20:07 +0100
Subject: [PATCH] Typo; cosmetic changes.

---
 syncthing-resolve-conflicts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/syncthing-resolve-conflicts b/syncthing-resolve-conflicts
index 2e490cf..927f6b8 100755
--- a/syncthing-resolve-conflicts
+++ b/syncthing-resolve-conflicts
@@ -54,7 +54,7 @@ warning() {
     local mesg
     mesg="$1"; shift
     # shellcheck disable=SC2059
-    printf "\n${YELLOW}==> $(translate "WARNING:")${ALL_OFF} ${mesg}${ALL_OFF}\n" "$@" >&2
+    printf "${YELLOW}==> $(translate "WARNING:")${ALL_OFF} ${mesg}${ALL_OFF}\n" "$@" >&2
 }
 
 error() {
@@ -247,7 +247,7 @@ fi
 # delete them one by one if specified.
 if [ ! ${#nontext[@]} -eq 0 ]
 then
-    warning "The following files that are non-text:"
+    warning "The following conflicts involve non-text files:"
     for f in "${nontext[@]}"
     do
         msg "Non-text file: %s" "$f"