title: How to merge two source files easily?
body: <p>I am working with another colleague in C# in VS2005 in a not very complex project. However, we have no version control system, we send each other our last version and copy the changes into our own files.</p>
  
  <p>We now have to merge both files (most of the project is a single form file) into a last version of the project.</p>
  
  <p>Any suggestions? Maybe trying diff tools? It must be done quickly and probably learning how to use complex revision control programs is not doable.</p>