From 0a331ea7e1ce48a3764984e6a6519d4ff5fa9c09 Mon Sep 17 00:00:00 2001 From: LaptekTools Date: Wed, 7 Oct 2026 06:24:12 +0200 Subject: [PATCH] Add Conflict Preview to community conflict tools --- users/contrib.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/users/contrib.rst b/users/contrib.rst index a3ade189..375da0b5 100644 --- a/users/contrib.rst +++ b/users/contrib.rst @@ -281,6 +281,13 @@ Resolving conflicts finds each conflict and let the user decide whether to open the merge program or to skip the file. +* `Conflict Preview `_ + + A read-only browser tool for selected Syncthing conflict copies. Groups + matching filenames and compares UTF-8 file contents, keeping unreadable + files and missing originals visible. It does not choose a version, merge + or delete files. `Source code `_. + Older, Possibly Unmaintained ----------------------------