From a22fc7f278174b165dea261b5fda70bc46d15207 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Mon, 7 Feb 2022 22:40:47 +0900
Subject: feat(base/development): set mergetool

---
 home/profiles/base/default.nix        | 1 +
 home/profiles/development/default.nix | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'home')

diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix
index 7e67dc6..f2f7883 100644
--- a/home/profiles/base/default.nix
+++ b/home/profiles/base/default.nix
@@ -192,6 +192,7 @@ in
 
       zshell.aliases = {
         e = "nvim";
+        nvimdiff = "nvim -d";
       };
 
       zoxide = {
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix
index af06caf..c823532 100644
--- a/home/profiles/development/default.nix
+++ b/home/profiles/development/default.nix
@@ -37,6 +37,9 @@ in
       extraConfig = {
         init.defaultBranch = "main";
         pull.rebase = true;
+
+        merge.tool = "nvimdiff";
+        mergetool.prompt = false;
       };
 
       ignores = [
-- 
cgit 1.4.1