1 files changed, 1 insertions, 0 deletions

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 = {