title: Manual merge only on Git Extensions
body: <p>I am very new to Git, and I use Git extensions. Whenever I pull, Git auto merges using <a href="http://kdiff3.sourceforge.net/" rel="nofollow noreferrer">KDiff3</a> and only requests help when it sees conflicts. However, I am not very satisfied with the auto merge feature as I see the merged files had a few conflicts which were not reported. I would like to disable auto merge in Git Extensions. I would like Git to give me the control to manually merge the files every time I pull.</p>
  
  <p>As I am very new to Git, if you ask me to change a few .git files, please do mention the most probable physical location of the file.</p>