title: How do you merge in GIT on Windows?
body: <p>I tried to use GIT however for me the biggest problem with it is that there is no tool for merge'ing. At least the msysgit does not give me anything. How can I merge in GIT? Are there any great tools for it or do I have to use WinMerge or application like that?</p>
  
  <p>I use Java and Eclipse.</p>