diff options
| -rw-r--r-- | home/profiles/development/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix index 02599a2..076ac13 100644 --- a/home/profiles/development/default.nix +++ b/home/profiles/development/default.nix @@ -40,7 +40,8 @@ in options = { dark = true; - file-style = "omit"; + conflictstyle = "diff3"; + side-by-side = true; syntax-theme = "ansi"; }; }; |