diff options
| author | sefidel <contact@sefidel.net> | 2022-03-18 06:55:47 +0900 |
|---|---|---|
| committer | sefidel <contact@sefidel.net> | 2022-03-18 06:55:47 +0900 |
| commit | 94f9caf21d40f079bcde46eab74e649c11dca76a (patch) | |
| tree | 91c81e7ed3c50f7315817b9ccb7cc8b816e6ce07 /home/profiles/development | |
| parent | ae06102731e2c7add93f02a4a93b2cbf57250ac7 (diff) | |
| download | nixrc-94f9caf21d40f079bcde46eab74e649c11dca76a.tar.gz nixrc-94f9caf21d40f079bcde46eab74e649c11dca76a.zip | |
Revert "Revert "feat(home/development): use diff3 on conflict""
This reverts commit 0655c7c41c2081cf8056c1f65b257a7fedf9f6d4.
Diffstat (limited to 'home/profiles/development')
| -rw-r--r-- | home/profiles/development/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix index aaf7878..4202f53 100644 --- a/home/profiles/development/default.nix +++ b/home/profiles/development/default.nix @@ -37,6 +37,7 @@ in init.defaultBranch = "main"; pull.rebase = true; + merge.conflictStyle = "diff3"; merge.tool = "nvimdiff"; mergetool.prompt = false; }; |