From 7327bab7f2766b621de13ff611233a301ea6b5e6 Mon Sep 17 00:00:00 2001
From: Fabio Scotto di Santolo <fabio.scotto.di.santolo@ibm.com>
Date: Thu, 28 May 2026 14:54:07 +0200
Subject: [PATCH] Change merge and diff tool for git on workstation

---
 ansible/templates/workstation/.gitconfig.j2 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ansible/templates/workstation/.gitconfig.j2 b/ansible/templates/workstation/.gitconfig.j2
index ceb4381..a64a27b 100644
--- a/ansible/templates/workstation/.gitconfig.j2
+++ b/ansible/templates/workstation/.gitconfig.j2
@@ -24,13 +24,19 @@
 
 [merge]
   conflictstyle = diff3
-  tool = meld
+  tool = vscode
 
 [mergetool]
   prompt = false
 
+[mergetool "vscode"]
+  cmd = code --reuse-window --wait $MERGED
+
 [diff]
-  tool = meld
+  tool = vscode
+
+[difftool "vscode"]
+  cmd = code --reuse-window --wait --diff $LOCAL $REMOTE
 
 [color]
   ui = always