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