diff options
| author | Soispha <soispha@vhack.eu> | 2023-08-25 22:48:37 +0200 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2023-08-25 22:48:37 +0200 |
| commit | 0cd7b63ff51ba21af3f1e5dca8a60a653e8e20c2 (patch) | |
| tree | 33961ca3ebef8ed5f05d0242862e69297b544a42 | |
| parent | Fix(hm/conf/neovim/plugins): Move raw plugins to their config dirs (diff) | |
| download | nixos-config-0cd7b63ff51ba21af3f1e5dca8a60a653e8e20c2.tar.gz nixos-config-0cd7b63ff51ba21af3f1e5dca8a60a653e8e20c2.zip | |
Feat(hm/conf/git): Mark moved code in diffs and delta for merge conflicts
| -rw-r--r-- | home-manager/soispha/config/git/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/home-manager/soispha/config/git/default.nix b/home-manager/soispha/config/git/default.nix index 9e15da1d..cc505832 100644 --- a/home-manager/soispha/config/git/default.nix +++ b/home-manager/soispha/config/git/default.nix @@ -55,6 +55,12 @@ in { commit = { template = "${gitTemplateFile}"; }; + diff = { + colorMoved = "default"; + }; + merge = { + conflictstyle = "diff3"; + }; }; delta = { enable = true; |