To register oXygen XML Editor's Diff & Merge Tools with Git Tower for macOS.
- Click "Download ZIP" to download this gist to your computer. Double-click on the zip file to expand it.
- Copy the files in this gist to
~/Library/Application Support/com.fournova.Tower3/CompareTools/. (Paste this path into "Finder > Go > Go to Folder".)
- Open Terminal and enter:
cd ~/Library/Application Support/com.fournova.Tower3/CompareTools/ chmod +x oxygen-dir.sh oxygen-file.sh
- Restart Tower.
- In "Preferences > Git Config", set "Diff tool" to "oXygen Directory Diff", select the "Perform directory diff" checkbox, and set "Merge tool" to "oXygen File Diff".
In Tower, use the ⌘ + ⇧ + D keyboard shortcut (or "Repository > Open Diff Tool") to open a changeset in the oXygen Diff Directories app. Quit Diff Directories when finished.
When resolving a conflict in Tower, oXygen's Diff Files app will be opened. Quit Diff Files when finished.
Tower can only open one instance of the oXygen Directories/File Diff tools at a time, so before a new changeset can be viewed, the Diff app must be quit. Otherwise, changesets will be queued.