diff options
| author | sefidel <contact@sefidel.net> | 2022-03-12 17:25:12 +0900 |
|---|---|---|
| committer | sefidel <contact@sefidel.net> | 2022-03-12 17:25:16 +0900 |
| commit | fe8f9abb94c0606a4d8845be1982fa514b4ff73a (patch) | |
| tree | a17b55b8a941037392c4954cd0b267262b097cc7 | |
| parent | 0e59c90d5eccd202cc0202da284b9a24b0e93a90 (diff) | |
| download | nixrc-fe8f9abb94c0606a4d8845be1982fa514b4ff73a.tar.gz nixrc-fe8f9abb94c0606a4d8845be1982fa514b4ff73a.zip | |
feat(home/development): use diff3 on conflict
| -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; }; |