Last active
November 7, 2020 07:06
-
-
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
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
code --wait $4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?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> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[merge] | |
tool = vscode | |
[mergetool "vscode"] | |
cmd = code --wait $MERGED |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
For windows follow this doc =>
https://www.git-tower.com/help/win/integration/custom-diff-tools