pullreq/homebrew — pull request #1 by g--n (2014-10-09 05:51:25+00:00)
Title: deliberate merge conflict

To see how it can be resolved with Github flow.