diff options
| author | sefidel <contact@sefidel.net> | 2022-03-18 15:32:39 +0900 |
|---|---|---|
| committer | sefidel <contact@sefidel.net> | 2022-03-18 16:04:55 +0900 |
| commit | 0fa9f4bb11f3593c3115bcf212d2e7e3f2c77991 (patch) | |
| tree | d03d49765140a6ecffb76b4ae98eb2fb4f41da1e | |
| parent | 94f9caf21d40f079bcde46eab74e649c11dca76a (diff) | |
| download | nixrc-0fa9f4bb11f3593c3115bcf212d2e7e3f2c77991.tar.gz nixrc-0fa9f4bb11f3593c3115bcf212d2e7e3f2c77991.zip | |
feat(home/development)!: use vim-fugitive
| -rw-r--r-- | home/profiles/development/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix index 4202f53..6b064b6 100644 --- a/home/profiles/development/default.nix +++ b/home/profiles/development/default.nix @@ -38,7 +38,13 @@ in pull.rebase = true; merge.conflictStyle = "diff3"; - merge.tool = "nvimdiff"; + + mergetool.fugitive = { + cmd = ''nvim -f -c "Gvdiffsplit!" "$MERGED"''; + trustExitCode = true; + }; + + merge.tool = "fugitive"; mergetool.prompt = false; }; |