fscotto/infra
1
0
Fork 0
mirror of https://github.com/fscotto/infra.git synced 2026-09-27 19:03:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: use BobIDE as diff/merge tool for workstation

Browse Source
This commit is contained in:
Fabio Scotto di Santolo
2026-08-31 12:51:53 +02:00
parent 671581d717
commit 5914ae1557
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/templates/workstation/.gitconfig.j2
View File

@@ -24,19 +24,19 @@
[merge]
conflictstyle = diff3
tool = vscode
tool = bobide
[mergetool]
prompt = false
[mergetool "vscode"]
cmd = code --reuse-window --wait $MERGED
[mergetool "bobide"]
cmd = bobide --reuse-window --wait $MERGED
[diff]
tool = vscode
tool = bobide
[difftool "vscode"]
cmd = code --reuse-window --wait --diff $LOCAL $REMOTE
[difftool "bobide"]
cmd = bobide --reuse-window --wait --diff $LOCAL $REMOTE
[color]
ui = always