Add 'git conflicts' to show which files had a conflict due to merge.

I always have to look this up on stack overflow.  Hopefully this will
make it so I don't have to!

Auditors: alpert

Test Plan:
Ran
   git conflicts
manually.