joepairman.com
Managing XML in Git or Mercurial? Watch out for your merges
Using line-based diff and merge tools can result in invalid files or missing content. XML-aware merge tools avoid these problems.