Skip to content

Instantly share code, notes, and snippets.

@cassioscabral

cassioscabral/using_meld_on_mac.md

Forked from p1nox/using_meld_on_mac.md
Last active August 29, 2015 14:11
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save cassioscabral/51c7c6a2457eca616a43 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save cassioscabral/51c7c6a2457eca616a43 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
using_meld_on_mac.md

Using Meld merging tool on Mac

  1. Install XQuartz

  2. Install meld with brew

     brew install meld

  3. Copy PYTHONPATH

     brew info pygtk

  4. Paste result of (3) in ~/.bashrc or ~/.zshrc

     export PYTHONPATH=/usr/local/lib/python2.7/site-packages:$PYTHONPATH

  5. Set meld as your default git mergetool

     git config --global merge.tool meld
 git config --global diff.external git-meld

  6. Go find your conflicts!

Source: Homebrew/legacy-homebrew#20644

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