title: Git winmerge pop up "select files and folders" appearing
body: <p>I am merging my branch <code>A</code> to branch <code>B</code>. </p>
  
  <p>I am on branch <code>B</code> and I used the following command: <code>git merge --squash A</code>
  and it told me that I have conflicts that I have to resolve so I ran the following command: <code>git mergetool -t winmerge</code>. </p>
  
  <p>My winmerge window appeared, however, there is some pop up on my winmerge now asking "Select files or folders". This pop up never appeared before. It always just opened the winmerge window with the diff of the conflicted files.</p>
  
  <p>Why is that pop up appearing and how do I get it back to the default settings of the winmerge window appearing without that pop up?</p>
  
  <p>I have a picture below:</p>
  
  <p><a href="https://i.stack.imgur.com/NuS0B.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/NuS0B.png" alt="enter image description here"></a></p>