So many times you want to find which files have merge issues when on the command line.
$ git diff --check