Skip to content

Instantly share code, notes, and snippets.

@igorkulman
Last active November 7, 2020 07:06
Show Gist options
  • Save igorkulman/6796eb6deb669c773c8ef86dd433b34e to your computer and use it in GitHub Desktop.
Save igorkulman/6796eb6deb669c773c8ef86dd433b34e to your computer and use it in GitHub Desktop.
Visual Studio Code as a merge tool for Git Tower. Place both files to ~/Library/Application Support/com.fournova.Tower2/CompareTools/ and restart Git Tower
#!/bin/sh
code --wait $4
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>ApplicationIdentifier</key>
<string>com.microsoft.VSCode</string>
<key>ApplicationName</key>
<string>Visual Studio Code</string>
<key>DisplayName</key>
<string>Visual Studio Code</string>
<key>LaunchScript</key>
<string>code.sh</string>
<key>Identifier</key>
<string>code</string>
<key>SupportsMergeTool</key>
<true/>
<key>SupportsDiffChangeset</key>
<false/>
</dict>
</array>
</plist>
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait $MERGED
@alanaasmaa
Copy link

alanaasmaa commented Jul 30, 2018

For windows follow this doc => https://www.git-tower.com/help/win/integration/custom-diff-tools

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment