diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2025-03-03 13:17:44 +0100 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2025-03-03 13:17:44 +0100 |
| commit | 6364e88b93bd142f9e139269618fb9ae4987885b (patch) | |
| tree | d28750cc9cbb09c53b447cfe898fd95a3bb14f83 | |
| parent | a1827c79f4c3b05c4aef17b51872276112600d38 (diff) | |
| download | nixos-6364e88b93bd142f9e139269618fb9ae4987885b.tar nixos-6364e88b93bd142f9e139269618fb9ae4987885b.tar.gz nixos-6364e88b93bd142f9e139269618fb9ae4987885b.tar.bz2 nixos-6364e88b93bd142f9e139269618fb9ae4987885b.tar.xz nixos-6364e88b93bd142f9e139269618fb9ae4987885b.zip | |
...
| -rw-r--r-- | users/gkleen/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/users/gkleen/default.nix b/users/gkleen/default.nix index 074d4866..b018aa85 100644 --- a/users/gkleen/default.nix +++ b/users/gkleen/default.nix | |||
| @@ -61,6 +61,7 @@ | |||
| 61 | autoStash = true; | 61 | autoStash = true; |
| 62 | updateRefs = true; | 62 | updateRefs = true; |
| 63 | }; | 63 | }; |
| 64 | merge.conflictstyle = "zdiff3"; | ||
| 64 | }; | 65 | }; |
| 65 | }; | 66 | }; |
| 66 | 67 | ||