diff options
Diffstat (limited to 'hm/soispha/conf/unison/default.nix')
| -rw-r--r-- | hm/soispha/conf/unison/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hm/soispha/conf/unison/default.nix b/hm/soispha/conf/unison/default.nix index 6e17a86a..f681c6d8 100644 --- a/hm/soispha/conf/unison/default.nix +++ b/hm/soispha/conf/unison/default.nix @@ -19,9 +19,9 @@ backupdir = "${unisonPath}/backups"; backuploc = "central"; backupcurr = paths_to_merge; - merge = - builtins.map (x: ''${x} -> diff3 --text --merge CURRENT1 CURRENTARCH CURRENT2 > NEW'') - paths_to_merge; + # merge = + # builtins.map (x: ''${x} -> diff3 --text --merge CURRENT1 CURRENTARCH CURRENT2 > NEW'') + # paths_to_merge; }; paths_to_merge = mkPathName { |