From 2974c341b36cc0ceb4f76ad618c7f275c3d94969 Mon Sep 17 00:00:00 2001
From: Dominik Schrempf <dominik.schrempf@gmail.com>
Date: Sun, 14 Jan 2018 16:49:46 +0100
Subject: [PATCH] Change sync-conflict regex pattern.

fln="FILENAME WITHOUT EXTENSION"
ext="EXTENSION"

The sync-conflict regex pattern has changed from

  ${fln}.sync-conflict-YYYYMMDD-HHMMSS.${ext}

to

  ${fln}.sync-conflict-YYYYMMDD-HHMMSS-XXXXXXX.${ext}

where XXXXXXX is some hash code.
---
 syncthing-resolve-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syncthing-resolve-conflicts b/syncthing-resolve-conflicts
index 927f6b8..c95b04c 100755
--- a/syncthing-resolve-conflicts
+++ b/syncthing-resolve-conflicts
@@ -174,7 +174,7 @@ while IFS= read -u 3 -r -d '' conflict; do
     # TODO: Improve pattern match (digits only).
 
     # Original filename.
-    file="${conflict/.sync-conflict-????????-??????/}"
+    file="${conflict/.sync-conflict-????????-??????-???????/}"
     msg "Sync conflict: %s" "$conflict"
     # Handle sync conflict if original file exists.
     if [ ! -f "$file" ]