mxcl/homebrew — pull request #19762 by edrex (2013-05-13 02:06:38+00:00)
Title: upgrade meld to 1.7.2

adds 3 way merge support
see http://lukas.zapletalovi.com/2012/09/three-way-git-merging-with-meld.html