From b269df52cb1f9300d637dd601021fba1232ae9f1 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Wed, 2 Oct 2024 17:43:57 +0200
Subject: common/git: use nvim as jujutsu's merge-editor

---
 common/commandline/git.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'common')

diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index c107413..f3ba3e8 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -131,6 +131,7 @@ _inputs:
           # TODO: setup hunk.nvim as diff-editor
           # diff-editor = "nvim";
           diff.tool = "difft";
+          merge-editor = "nvim";
         };
 
         signing = {
-- 
cgit v1.2.3