[PATCH 2/2] mergetools: vimdiff3: fix diffopt options

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Aug 2, 2022, 21:41 UTC
Message-ID: <20220802214134.681300-3-felipe.contreras@gmail.com>
In-Reply-To: <20220802214134.681300-1-felipe.contreras@gmail.com>

If either closeoff or hiddenoff are enabled, vimdiff3 doesn't work as intended, so turn them off.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
 mergetools/vimdiff | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index f4c3bf6d11..baccabc403 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -395,7 +395,7 @@ merge_cmd () {
 		else
 			CMD='hid | hid'
 		fi
-		FINAL_CMD="-d -c '$CMD'"
+		FINAL_CMD="-d -c 'setl diffopt-=closeoff diffopt-=hiddenoff | $CMD'"
 		;;
 	*)
 		case "$1" in

-- 
2.37.1.313.ge269dbcbc5