title: How could I force mergetool GUI (KDiff3) to be always shown?
body: <p>How could I force the mergetool GUI to be always shown and disable any automatic resolving?</p>
  
  <p>Sometimes when there is a conflict during a merge and I use the mergetool, it simply immediately returns after I hit <kbd>Enter</kbd> on question <strong>"Hit return to start merge resolution tool (kdiff3)"</strong> and no GUI is shown and the conflict appears to be resolved.</p>
  
  <p>I have Git configured to use <a href="http://kdiff3.sourceforge.net/" rel="noreferrer">KDiff3</a> as the mergetool now, but it happened also when I have <code>codecompare</code> as the mergetool specified. I know that there is an option <em>"Auto save and quit on merge without conflicts"</em> in KDiff3, which could theoretically cause the described behaviour, but I have this option disabled/unchecked all the time.</p>
  
  <p>Also, there is the <strong>trustExitCode</strong> option directly in Git mergetool gitconfig, which I have set to true, but even if I set it to false, the GUI is not shown.</p>
  
  <p>I am not sure who does the auto resolving anyway. Mergetool in some preprocessing or KDiff3?</p>
  
  <p>I am running on Windows and have the Git-extensions installed.</p>
  
  <p>Similar question specific to KDiff3, was asked also here: <em><a href="https://stackoverflow.com/questions/10883336/kdiff3-wont-open-with-mergetool-command">Kdiff3 won&#39;t open with mergetool command</a></em></p>