diff options
| author | Soispha <soispha@vhack.eu> | 2024-03-01 16:53:05 +0100 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2024-03-01 16:53:05 +0100 |
| commit | d2d0803cf46fede00b006249e4df20f9f3f2c1ee (patch) | |
| tree | cf7e6fc2397078525b36108e5c8d330214c9eadd | |
| parent | fix(hm/conf/unison): Correctly use the `file_name` and `extisions` values (diff) | |
| download | nixos-config-d2d0803cf46fede00b006249e4df20f9f3f2c1ee.tar.gz nixos-config-d2d0803cf46fede00b006249e4df20f9f3f2c1ee.zip | |
fix(hm/conf/unison): Avoid merging, when the merge fails
Diffstat (limited to '')
| -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; }; |