title: How to successfully exit "vimdiff" (which is used as a merge tool for "git") without saving?
body: <p>I am new to this, so apologies about the basic question.</p>
  
  <p>I am using an <strong>Ubuntu</strong> environment. I have <strong>git</strong> installed. I setup <strong>vimdiff</strong> as the merge tool.</p>
  
  <p>I am testing the environment, but I am having a problem.</p>
  
  <p>I created a conflict in a <code>readme.txt</code> file. The conflict obviously happens when I try to merge from the branch <strong>develop</strong> to <strong>master</strong>. <em>As expected, some "markup characters" are added to <code>readme.txt</code> to indicate where the conflicts happen</em>. So, the next step is to call <code>git mergetool</code> which launches <strong>vimdiff</strong>.</p>
  
  <p>So far, everything is working as expected, and <strong>vimdiff</strong> is now launched. But then, I decided to exit <strong>vimdiff</strong> without making any changes. I wanted to "<em>postpone</em>" my changes till another time. So, I press <code>&lt;ESC&gt;</code> followed by <code>:qa!</code>, thinking this will stop the merge process. Unfortunately, this is not what happened. It looks like that the merge is now considered resolved and successful, and the <code>readme.txt</code> file, although did not change, and although contains the conflicts markup, is now ready to be committed.</p>
  
  <p>Now to my question. How can I terminate the <code>git mergetool</code> call, exit <strong>vimdiff</strong>, and start over, as if I did not make the call?</p>
  
  <p>Thanks.</p>