From e1fc3341e66003c280955c9e700d84746ccf6a47 Mon Sep 17 00:00:00 2001 From: Ade Attwood Date: Fri, 14 Jun 2024 18:08:19 +0100 Subject: [PATCH] fix(sapling): reorder the nvim diff def When using nvim as a merge tool I had the files in the wrong order. It was very confusing not having the local version in the middle and the base and remote on ether side. --- site-modules/core/templates/sapling.conf.liquid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site-modules/core/templates/sapling.conf.liquid b/site-modules/core/templates/sapling.conf.liquid index 6f26359..69f13af 100644 --- a/site-modules/core/templates/sapling.conf.liquid +++ b/site-modules/core/templates/sapling.conf.liquid @@ -30,5 +30,5 @@ pager = delta [merge-tools] nvim_diff.executable = nvim -nvim_diff.args = -d $local $other $base +nvim_diff.args = -d $base $local $other nvim_diff.priority = 1