diff options
Diffstat (limited to 'hm')
| -rw-r--r-- | hm/soispha/conf/unison/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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; }; |