From 0a55b67614ff29612fd55aab9994fdb6297c9a65 Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Thu, 29 Feb 2024 06:48:19 +0100
Subject: fix(hm/conf/unison): Add further files to auto merge

---
 hm/soispha/conf/unison/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hm/soispha/conf/unison/default.nix b/hm/soispha/conf/unison/default.nix
index 962dd8ab..91a348c3 100644
--- a/hm/soispha/conf/unison/default.nix
+++ b/hm/soispha/conf/unison/default.nix
@@ -20,13 +20,13 @@
     backuploc = "central";
     backupcurr = paths_to_merge;
     merge =
-      builtins.map (x: ''${x} -> diff3 -m CURRENT1 CURRENTARCH CURRENT2 > NEW || echo "differences detected"'')
+      builtins.map (x: ''${x} -> diff3 --text --merge CURRENT1 CURRENTARCH CURRENT2 > NEW || echo "differences detected"'')
       paths_to_merge;
   };
 
   paths_to_merge = mkPathName {
     file_names = [];
-    extensions = ["history"];
+    extensions = ["history" "harpoon.json" "file_frecency.bin" "main.shada"];
   };
 
   paths_to_keep = [
-- 
cgit 1.4.1