From d2d0803cf46fede00b006249e4df20f9f3f2c1ee Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Fri, 1 Mar 2024 16:53:05 +0100
Subject: fix(hm/conf/unison): Avoid merging, when the merge fails

---
 hm/soispha/conf/unison/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hm')

diff --git a/hm/soispha/conf/unison/default.nix b/hm/soispha/conf/unison/default.nix
index e36c3918..2df55192 100644
--- a/hm/soispha/conf/unison/default.nix
+++ b/hm/soispha/conf/unison/default.nix
@@ -20,7 +20,7 @@
     backuploc = "central";
     backupcurr = paths_to_merge;
     merge =
-      builtins.map (x: ''${x} -> diff3 --text --merge CURRENT1 CURRENTARCH CURRENT2 > NEW || echo "differences detected"'')
+      builtins.map (x: ''${x} -> diff3 --text --merge CURRENT1 CURRENTARCH CURRENT2 > NEW'')
       paths_to_merge;
   };
 
-- 
cgit 1.4.1