thoughtbot/dotfiles — pull request #193 by christoomey (2013-09-13 19:48:42+00:00)
Title: Add git conflicts alias

List conflicted files in a format that can be used to vim with the conflicted files loaded and in the arglist.

``` bash
vim `git conflicts`
```