title: How to merge all files manually in Git?
body: <p>I want to merge all files <strong>manually</strong> with meld or any other diff tool, how can I do this with Git? <br />
  When I run <code>git mergetool</code> 
  it says <code>no files need merging</code>. So I suppose I can do it only if I have conflicts.</p>