diff options
| author | David Morgan <djm_uk@protonmail.com> | 2022-11-21 16:44:26 +0000 |
|---|---|---|
| committer | David Morgan <djm_uk@protonmail.com> | 2022-11-21 16:44:26 +0000 |
| commit | 3916b48eb1b80ce791107f316582a75a9e8346e7 (patch) | |
| tree | 58f8793de2a21a0faccce726c85dde1b35a64153 /nix-conf | |
| parent | b2912a095f747dbd0a4bacbb1ec8f7ab3ed642a6 (diff) | |
| download | dotfiles-3916b48eb1b80ce791107f316582a75a9e8346e7.tar.gz | |
Remove git merge config
Diffstat (limited to 'nix-conf')
| -rw-r--r-- | nix-conf/home/includes/common.nix | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/nix-conf/home/includes/common.nix b/nix-conf/home/includes/common.nix index 8d58312..971aa7d 100644 --- a/nix-conf/home/includes/common.nix +++ b/nix-conf/home/includes/common.nix @@ -204,10 +204,6 @@ in prompt = false; difftastic = { cmd = ''difft "$LOCAL" "$REMOTE"''; }; }; - merge = { - conflictstyle = "diff3"; - ff = "only"; - }; pull = { ff = "only"; rebase = false; |