title: Version Control with XML diff and merge
body: <p>I'm looking for an open source version control tool which can diff and merge XML files. </p>
  
  <p>The difficulty I have to find such a tool is, that I need a correct merge of a XML file comparing the nodes and not the lines.</p>
  
  <p>Any idea?
  Thanks!</p>