title: Show all conflicting files in Android Studio GUI
body: <p>Is there a way to show all conflicting files in Android Studio? I am thinking of some view/list that will only show the conflicting ones.</p>
  
  <p>Currently I am finding them manually by looking into terminal output after running <code>git merge</code> and opening the ones that were not auto-merged one by one.</p>