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