From 659328a7b884c2e0529eb1e076b5dafdcb04cb07 Mon Sep 17 00:00:00 2001 From: Ade Attwood Date: Mon, 29 Jan 2024 20:20:41 +0000 Subject: [PATCH] fix(sapling): setup nvim as the diff tool There built in diff tool points to vimdiff. This dose not have all of my key bindings and all the nice features I have setup in nvim. --- site-modules/core/templates/sapling.conf.liquid | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site-modules/core/templates/sapling.conf.liquid b/site-modules/core/templates/sapling.conf.liquid index 514ea55..d62a26d 100644 --- a/site-modules/core/templates/sapling.conf.liquid +++ b/site-modules/core/templates/sapling.conf.liquid @@ -25,3 +25,8 @@ color = never # switching between git and sl. [pager] pager = delta + +[merge-tools] +nvim_diff.executable = nvim +nvim_diff.args = -d $local $other $base +nvim_diff.priority = 1