Get a list of files with conflicts

# ~/.gitconfig
[alias]
  cnf = !git ls-files -u | cut -f 2 | sort -u

Now you can:

$> git cnf
app/controllers/application_controller.rb
app/models/user.rb

I use vim as well so I often open all conflicts with:

$> vim -o $(git cnf)