From 0fa9f4bb11f3593c3115bcf212d2e7e3f2c77991 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Fri, 18 Mar 2022 15:32:39 +0900
Subject: feat(home/development)!: use vim-fugitive
---
home/profiles/development/default.nix | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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;
};
--
cgit 1.4.1